copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use with_unix_fd_list variant of DBus method call.

Browse source 
Any returned 'h' type argument is intended to be an index into a
unix fd list structure obtained separately. Such a unix fd list, in
python, will manage and close any contained fds as a whole, or fds may
be retrieved, managed, and closed individually, as is done in this
patch.

Also, use None instead of -1 because python.

This patch means gajim keeps its supsend inhibitor open and stops it
closing stdin on suspend.

Fixes #8852
This commit is contained in:
Matthew W. S. Bell 2018-01-04 13:23:17 +00:00 • committed by Philipp Hörist
parent 5ef1813405
commit 52482ec70d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gajim/logind_listener.py
View file

@ -33,7 +33,7 @@ log = logging.getLogger('gajim.logind_listener')
# file descriptor of the inhibitor; negative number means we don't # file descriptor of the inhibitor; negative number means we don't
# hold any (yet) # hold any (yet)
fd = -1 fd = None
def signal_received(connection, sender_name, object_path, def signal_received(connection, sender_name, object_path,
@ -61,9 +61,9 @@ def signal_received(connection, sender_name, object_path,
conn.time_to_reconnect = 5 conn.time_to_reconnect = 5
# close the file descriptor and let the computer suspend # close the file descriptor and let the computer suspend
if fd >= 0: if fd is not None:
os.close(fd) os.close(fd)
fd = -1 fd = None
else: else:
# something is wrong, the system is suspending but we don't have # something is wrong, the system is suspending but we don't have
# a lock file # a lock file
@ -76,23 +76,23 @@ def get_inhibitor(connection):
global fd global fd
if fd >= 0: if fd is not None:
# someting is wrong, we haven't closed the previous file descriptor # someting is wrong, we haven't closed the previous file descriptor
# and we ask for yet another one # and we ask for yet another one
log.warning('We are about to ask for a sleep inhibitor, but we seem ' log.warning('We are about to ask for a sleep inhibitor, but we seem '
'to be holding one already') 'to be holding one already')
ret = connection.call_sync( ret = connection.call_with_unix_fd_list_sync(
'org.freedesktop.login1', 'org.freedesktop.login1',
'/org/freedesktop/login1', '/org/freedesktop/login1',
'org.freedesktop.login1.Manager', 'org.freedesktop.login1.Manager',
'Inhibit', 'Inhibit',
GLib.Variant('(ssss)', ('sleep', 'org.gajim.Gajim', GLib.Variant('(ssss)', ('sleep', 'org.gajim.Gajim',
'Disconnect from the network', 'delay')), 'Disconnect from the network', 'delay')),
None, GLib.VariantType.new('(h)'),
Gio.DBusCallFlags.NONE, -1, None) Gio.DBusCallFlags.NONE, -1, None, None)
fd = ret[0] fd = ret.out_fd_list.get(ret[0])
def appeared(connection, name, name_owner, *user_data): def appeared(connection, name, name_owner, *user_data):