Commits July 2015

commits@gajim.org

1 participants
101 discussions

gajim: correctly detect that key is not trusted before encryptin...
by Gajim 29 Jul '15

29 Jul '15

changeset 4d7826936744 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4d7826936744 description: correctly detect that key is not trusted before encrypting. Doc says: "gpg just prints a message to the console, but does not provide a specific error indication that the Python wrapper can use." Fixes #8040. See #8041 diffstat: src/common/gnupg.py | 5 ++++- src/common/gpg.py | 10 +++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diffs (45 lines): diff -r 2127559a62b2 -r 4d7826936744 src/common/gnupg.py --- a/src/common/gnupg.py Tue Jul 28 20:19:19 2015 +0200 +++ b/src/common/gnupg.py Wed Jul 29 22:32:02 2015 +0200 @@ -1094,7 +1094,7 @@ getattr(result, keyword)(L) return result - def list_keys(self, secret=False): + def list_keys(self, secret=False, keys=None): """ list the keys currently in the keyring >>> import shutil @@ -1116,6 +1116,9 @@ which='secret-keys' args = ["--list-%s" % which, "--fixed-list-mode", "--fingerprint", "--with-colons"] + if keys: + for key in keys: + args.append(key) p = self._open_subprocess(args) return self._get_list_output(p, 'list') diff -r 2127559a62b2 -r 4d7826936744 src/common/gpg.py --- a/src/common/gpg.py Tue Jul 28 20:19:19 2015 +0200 +++ b/src/common/gpg.py Wed Jul 29 22:32:02 2015 +0200 @@ -54,12 +54,16 @@ for key in recipients: if key not in self.always_trust: trust = False + if not trust: + # check that we'll be able to encrypt + result = super(GnuPG, self).list_keys(recipients, + keys=recipients) + for key in result: + if key['trust'] not in ('f', 'u'): + return '', 'NOT_TRUSTED' result = super(GnuPG, self).encrypt(str_, recipients, always_trust=trust, passphrase=self.passphrase) - if result.status == 'invalid recipient': - return '', 'NOT_TRUSTED' - if result.ok: error = '' else:

1 0

gajim: fix file transfer. Files can be something else that utf8
by Gajim 28 Jul '15

28 Jul '15

changeset a66587b34221 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a66587b34221 description: fix file transfer. Files can be something else that utf8 diffstat: src/common/proxy65_manager.py | 12 +++--- src/common/socks5.py | 70 +++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 45 deletions(-) diffs (255 lines): diff -r f21a251c01b5 -r a66587b34221 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Sat Jul 25 22:03:48 2015 +0200 +++ b/src/common/proxy65_manager.py Tue Jul 28 20:32:14 2015 +0200 @@ -304,14 +304,14 @@ self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) # begin negotiation. on success 'address' != 0 buff = self.receive() - if buff == '': + if buff == b'': # end connection self.pollend() return # read auth response if buff is None or len(buff) != 2: return None - version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) + version, method = struct.unpack('!BB', buff[:2]) if version != 0x05 or method == 0xff: self.pollend() return @@ -349,7 +349,7 @@ self._sock.setblocking(False) self._send = self._sock.send self._recv = self._sock.recv - self.buff = '' + self.buff = b'' self.state = 1 # connected log.debug('Host connected to %s:%s' % (self.host, self.port)) self.idlequeue.plug_idle(self, True, False) @@ -424,7 +424,7 @@ self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) # begin negotiation. on success 'address' != 0 buff = self.receive() - if buff == '': + if buff == b'': # end connection self.pollend() return @@ -432,7 +432,7 @@ # read auth response if buff is None or len(buff) != 2: return None - version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) + version, method = struct.unpack('!BB', buff[:2]) if version != 0x05 or method == 0xff: self.pollend() return @@ -444,7 +444,7 @@ # read connect response if buff is None or len(buff) < 2: return None - version, reply = struct.unpack('!BB', buff[:2].encode('utf-8')) + version, reply = struct.unpack('!BB', buff[:2]) if version != 0x05 or reply != 0x00: self.pollend() return diff -r f21a251c01b5 -r a66587b34221 src/common/socks5.py --- a/src/common/socks5.py Sat Jul 25 22:03:48 2015 +0200 +++ b/src/common/socks5.py Tue Jul 28 20:32:14 2015 +0200 @@ -149,8 +149,8 @@ socks5obj = Socks5SenderClient(self.idlequeue, idx, self, _sock=None,host=str(streamhost['host']), port=int(streamhost['port']),fingerprint=fp, - connected=False, file_props=file_props, - initiator=streamhost['initiator'], + connected=False, file_props=file_props, + initiator=streamhost['initiator'], target=streamhost['target']) socks5obj.streamhost = streamhost self.add_sockobj(account, socks5obj) @@ -395,7 +395,7 @@ connections with 1 """ if idx != -1: - for key in self.readers.keys(): + for key in list(self.readers.keys()): if idx in key: self.remove_receiver_by_key(key, do_disconnect=do_disconnect) @@ -452,7 +452,7 @@ self.state = 0 # not connected self.pauses = 0 self.size = 0 - self.remaining_buff = '' + self.remaining_buff = b'' self.file = None self.connected = False self.mode = '' @@ -618,15 +618,15 @@ Read small chunks of data. Call owner's disconnected() method if appropriate """ - received = '' + received = b'' try: - add = self._recv(64).decode('utf-8') + add = self._recv(64) except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: log.info('SSL rehandshake request : ' + repr(e)) raise e except Exception: - add = '' + add = b'' received += add if len(add) == 0: self.disconnect() @@ -647,9 +647,9 @@ return len(raw_data) def write_next(self): - if self.remaining_buff != '': + if self.remaining_buff != b'': buff = self.remaining_buff - self.remaining_buff = '' + self.remaining_buff = b'' else: try: self.open_file_for_reading() @@ -688,7 +688,7 @@ if lenn != len(buff): self.remaining_buff = buff[lenn:] else: - self.remaining_buff = '' + self.remaining_buff = b'' self.state = 7 # continue to write in the socket if lenn == 0: return None @@ -707,7 +707,7 @@ self.file_props.error = -2 return None fd = None - if self.remaining_buff != '': + if self.remaining_buff != b'': try: fd = self.get_fd() except IOError: @@ -721,7 +721,7 @@ self.file_props.last_time self.file_props.last_time = current_time self.file_props.received_len += lenn - self.remaining_buff = '' + self.remaining_buff = b'' if self.file_props.received_len == self.file_props.size: self.rem_fd(fd) self.disconnect() @@ -736,13 +736,13 @@ self.file_props.error = -6 # file system error return 0 try: - buff = self._recv(MAX_BUFF_LEN).decode('utf-8') + buff = self._recv(MAX_BUFF_LEN) except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: log.info('SSL rehandshake request :' + repr(e)) raise e except Exception: - buff = '' + buff = b'' current_time = self.idlequeue.current_time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time @@ -819,9 +819,9 @@ """ auth_mechanisms = [] try: - num_auth = struct.unpack('!xB', buff[:2].encode('utf-8'))[0] + num_auth = struct.unpack('!xB', buff[:2])[0] for i in list(range(num_auth)): - mechanism, = struct.unpack('!B', buff[1 + i].encode('utf-8')) + mechanism, = struct.unpack('!B', buff[1 + i]) auth_mechanisms.append(mechanism) except Exception: return None @@ -855,25 +855,22 @@ def _parse_request_buff(self, buff): try: # don't trust on what comes from the outside - req_type, host_type, = struct.unpack('!xBxB', buff[:4].encode( - 'utf-8')) + req_type, host_type, = struct.unpack('!xBxB', buff[:4]) if host_type == 0x01: - host_arr = struct.unpack('!iiii', buff[4:8].encode('utf-8')) + host_arr = struct.unpack('!iiii', buff[4:8]) host, = '.'.join(str(s) for s in host_arr) host_len = len(host) elif host_type == 0x03: - host_len, = struct.unpack('!B', buff[4].encode('utf-8')) - host, = struct.unpack('!%ds' % host_len, buff[5:5 + host_len].\ - encode('utf-8')) + host_len, = struct.unpack('!B', buff[4]) + host, = struct.unpack('!%ds' % host_len, buff[5:5 + host_len]) portlen = len(buff[host_len + 5:]) if portlen == 1: - port, = struct.unpack('!B', buff[host_len + 5].encode('utf-8')) + port, = struct.unpack('!B', buff[host_len + 5]) elif portlen == 2: - port, = struct.unpack('!H', buff[host_len + 5:].encode('utf-8')) + port, = struct.unpack('!H', buff[host_len + 5:]) # file data, comes with auth message (Gaim bug) else: - port, = struct.unpack('!H', buff[host_len + 5: host_len + 7].\ - encode('utf-8')) + port, = struct.unpack('!H', buff[host_len + 5: host_len + 7]) self.remaining_buff = buff[host_len + 7:] except Exception: return (None, None, None) @@ -890,7 +887,7 @@ log.info("SSL rehandshake request : " + repr(e)) raise e try: - version, method = struct.unpack('!BB', buff.encode('utf-8')) + version, method = struct.unpack('!BB', buff) except Exception: version, method = None, None if version != 0x05 or method == 0xff: @@ -1197,7 +1194,7 @@ if self.state == 2: # read auth response if buff is None or len(buff) != 2: return None - version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) + version, method = struct.unpack('!BB', buff[:2]) if version != 0x05 or method == 0xff: self.disconnect() elif self.state == 4: # get approve of our request @@ -1206,23 +1203,18 @@ sub_buff = buff[:4] if len(sub_buff) < 4: return None - version, address_type = struct.unpack('!BxxB', buff[:4].encode( - 'utf-8')) + version, address_type = struct.unpack('!BxxB', buff[:4]) addrlen = 0 if address_type == 0x03: - addrlen = ord(buff[4]) - address = struct.unpack('!%ds' % addrlen, buff[5:addrlen + 5].\ - encode('utf-8')) + addrlen = buff[4] + address = struct.unpack('!%ds' % addrlen, buff[5:addrlen + 5]) portlen = len(buff[addrlen + 5:]) if portlen == 1: - port, = struct.unpack('!B', buff[addrlen + 5].encode( - 'utf-8')) + port, = struct.unpack('!B', buff[addrlen + 5]) elif portlen == 2: - port, = struct.unpack('!H', buff[addrlen + 5:].encode( - 'utf-8')) + port, = struct.unpack('!H', buff[addrlen + 5:]) else: # Gaim bug :) - port, = struct.unpack('!H', buff[addrlen + 5:addrlen + 7].\ - encode('utf-8')) + port, = struct.unpack('!H', buff[addrlen + 5:addrlen + 7]) self.remaining_buff = buff[addrlen + 7:] self.state = 5 # for senders: init file_props and send '\n' if self.queue.on_success:

1 0

gajim: prevent traceback
by Gajim 28 Jul '15

28 Jul '15

changeset 2127559a62b2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2127559a62b2 description: prevent traceback diffstat: src/common/connection.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 7aa8b24aa913 -r 2127559a62b2 src/common/connection.py --- a/src/common/connection.py Mon Jul 27 22:58:47 2015 +0200 +++ b/src/common/connection.py Tue Jul 28 20:19:19 2015 +0200 @@ -913,7 +913,9 @@ self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) - self.connection.UnregisterDisconnectHandler(self._disconnectedReconnCB) + if self.connection: + self.connection.UnregisterDisconnectHandler( + self._disconnectedReconnCB) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1

1 0

gajim: do not try to go autoaway or come back from autoaway if w...
by Gajim 27 Jul '15

27 Jul '15

changeset 7aa8b24aa913 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7aa8b24aa913 description: do not try to go autoaway or come back from autoaway if we are not connected. See #8062 diffstat: src/gui_interface.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 312de2800974 -r 7aa8b24aa913 src/gui_interface.py --- a/src/gui_interface.py Mon Jul 27 21:19:25 2015 +0200 +++ b/src/gui_interface.py Mon Jul 27 22:58:47 2015 +0200 @@ -2936,7 +2936,8 @@ def gnome_screensaver_ActiveChanged_cb(active): if not active: for account in gajim.connections: - if gajim.sleeper_state[account] == 'autoaway-forced': + if gajim.account_is_connected(account) and \ + gajim.sleeper_state[account] == 'autoaway-forced': # We came back online ofter gnome-screensaver # autoaway self.roster.send_status(account, 'online', @@ -2952,6 +2953,8 @@ not gajim.sleeper_state[account]: continue if gajim.sleeper_state[account] == 'online': + if not gajim.account_is_connected(account): + continue # we save out online status gajim.status_before_autoaway[account] = \ gajim.connections[account].status

1 0

gajim: fix loading secret files that have been created with gaji...
by Gajim 27 Jul '15

27 Jul '15

changeset 312de2800974 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=312de2800974 description: fix loading secret files that have been created with gajim <= 0.16.1. Fixes #8114 diffstat: src/secrets.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diffs (37 lines): diff -r ec23fdfcbcd2 -r 312de2800974 src/secrets.py --- a/src/secrets.py Mon Jul 27 13:36:49 2015 +0200 +++ b/src/secrets.py Mon Jul 27 21:19:25 2015 +0200 @@ -31,7 +31,7 @@ secrets_filename = gajimpaths['SECRETS_FILE'] secrets_cache = None -class Secrets(object): +class Secrets(): def __init__(self, filename): self.filename = filename self.srs = {} @@ -95,13 +95,23 @@ return pk def load_secrets(filename): - f = open(filename, 'r') + global Secrets + f = open(filename, 'rb') try: secrets = pickle.load(f) except (KeyError, EOFError): f.close() secrets = Secrets(filename) + except (AttributeError, TypeError): + class Secrets(object, Secrets): + pass + try: + f.seek(0) + secrets = pickle.load(f) + except (KeyError, EOFError): + f.close() + secrets = Secrets(filename) return secrets

1 0

gajim: do not crash when authentication with server fails. Fixes...
by Gajim 27 Jul '15

27 Jul '15

changeset ec23fdfcbcd2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ec23fdfcbcd2 description: do not crash when authentication with server fails. Fixes #8115 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 48bf7f9c7861 -r ec23fdfcbcd2 src/common/connection.py --- a/src/common/connection.py Sun Jul 26 14:25:21 2015 +0200 +++ b/src/common/connection.py Mon Jul 27 13:36:49 2015 +0200 @@ -1512,7 +1512,7 @@ if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None - return + return if not self.connected: # We went offline during connecting process if self.on_connect_auth: self.on_connect_auth(None)

1 0

gajim: set urgency_hint when notify_on_all_muc_messages is True....
by Gajim 26 Jul '15

26 Jul '15

changeset 48bf7f9c7861 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=48bf7f9c7861 description: set urgency_hint when notify_on_all_muc_messages is True. Fixes #8110 diffstat: src/message_window.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r a1582f292e62 -r 48bf7f9c7861 src/message_window.py --- a/src/message_window.py Sun Jul 26 14:05:47 2015 +0200 +++ b/src/message_window.py Sun Jul 26 14:25:21 2015 +0200 @@ -519,7 +519,8 @@ if control.type_id == message_control.TYPE_GC: name = control.room_jid.split('@')[0] - urgent = control.attention_flag + urgent = control.attention_flag or \ + gajim.config.get('notify_on_all_muc_messages') else: name = control.contact.get_shown_name() if control.resource:

1 0

gajim: don't reconnect twice when connection is lost
by Gajim 26 Jul '15

26 Jul '15

changeset a1582f292e62 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a1582f292e62 description: don't reconnect twice when connection is lost diffstat: src/common/connection.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r aa1b7f9b942b -r a1582f292e62 src/common/connection.py --- a/src/common/connection.py Fri Jul 24 22:25:24 2015 +0200 +++ b/src/common/connection.py Sun Jul 26 14:05:47 2015 +0200 @@ -884,6 +884,7 @@ self.connection.disconnect() self.last_connection = None self.connection = None + def set_oldst(self): # Set old state if self.old_show: self.connected = gajim.SHOW_LIST.index(self.old_show) @@ -912,6 +913,7 @@ self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) + self.connection.UnregisterDisconnectHandler(self._disconnectedReconnCB) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1

1 0

python-nbxmpp: make xsend work with python3
by Python-nbxmpp 26 Jul '15

26 Jul '15

changeset ffa6dc7501b6 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=ffa6dc7501b6 description: make xsend work with python3 diffstat: README | 2 +- doc/examples/xsend.py | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diffs (89 lines): diff -r cd50e6d917aa -r ffa6dc7501b6 README --- a/README Thu Jul 16 21:11:51 2015 +0200 +++ b/README Sun Jul 26 13:10:42 2015 +0200 @@ -11,7 +11,7 @@ Usage -You have to 'import xmpppy' in your program. Then look at examples in ths doc +You have to 'import xmpppy' in your program. Then look at examples in the doc folder. 2012-05-08 Yann Leboulanger diff -r cd50e6d917aa -r ffa6dc7501b6 doc/examples/xsend.py --- a/doc/examples/xsend.py Thu Jul 16 21:11:51 2015 +0200 +++ b/doc/examples/xsend.py Sun Jul 26 13:10:42 2015 +0200 @@ -1,11 +1,14 @@ -#!/usr/bin/python +#!/usr/bin/python3 import sys import os import nbxmpp import time import logging -import gobject +try: + from gi.repository import GObject as gobject +except Exception: + import gobject consoleloghandler = logging.StreamHandler() root_log = logging.getLogger('nbxmpp') @@ -13,7 +16,7 @@ root_log.addHandler(consoleloghandler) if len(sys.argv) < 2: - print "Syntax: xsend JID text" + print("Syntax: xsend JID text") sys.exit(0) to_jid = sys.argv[1] @@ -28,7 +31,7 @@ for mandatory in ['jid', 'password']: if mandatory not in jidparams.keys(): open(os.environ['HOME']+'/.xsend','w').write('#Uncomment fields before use and type in correct credentials.\n#JID=romeo(a)montague.net/resource (/resource is optional)\n#PASSWORD=juliet\n') - print 'Please point ~/.xsend config file to valid JID for sending messages.' + print('Please point ~/.xsend config file to valid JID for sending messages.') sys.exit(0) class Connection: @@ -40,20 +43,20 @@ def on_auth(self, con, auth): if not auth: - print 'could not authenticate!' + print('could not authenticate!') sys.exit() - print 'authenticated using', auth + print('authenticated using ' + auth) self.send_message(to_jid, text) def on_connected(self, con, con_type): - print 'connected with', con_type + print('connected with ' + con_type) auth = self.client.auth(self.jid.getNode(), self.password, resource=self.jid.getResource(), sasl=1, on_auth=self.on_auth) def get_password(self, cb, mech): cb(self.password) def on_connection_failed(self): - print 'could not connect!' + print('could not connect!') def _event_dispatcher(self, realm, event, data): pass @@ -61,11 +64,11 @@ def connect(self): idle_queue = nbxmpp.idlequeue.get_idlequeue() self.client = nbxmpp.NonBlockingClient(self.jid.getDomain(), idle_queue, caller=self) - self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '', None)) + self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '', None, None)) def send_message(self, to_jid, text): id_ = self.client.send(nbxmpp.protocol.Message(to_jid, text, typ='chat')) - print 'sent message with id', id_ + print('sent message with id ' + id_) gobject.timeout_add(1000, self.quit) def quit(self):

1 0

gajim: specify module version before importing
by Gajim 25 Jul '15

25 Jul '15

changeset cee42c275cc2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cee42c275cc2 description: specify module version before importing diffstat: src/common/gajim.py | 3 ++- src/common/passwords.py | 2 ++ src/gtkgui_helpers.py | 2 ++ src/notify.py | 2 ++ 4 files changed, 8 insertions(+), 1 deletions(-) diffs (77 lines): diff -r 88d74b9f4ea1 -r cee42c275cc2 src/common/gajim.py --- a/src/common/gajim.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/common/gajim.py Sat Jul 25 22:03:24 2015 +0200 @@ -31,6 +31,7 @@ import os import logging import locale +import gi from common import config import nbxmpp @@ -188,7 +189,6 @@ if os.name == 'nt': os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' - import gi gi.require_version('Farstream', '0.2') from gi.repository import Farstream gi.require_version('Gst', '1.0') @@ -208,6 +208,7 @@ HAVE_UPNP_IGD = True try: + gi.require_version('GUPnPIgd', '1.0') from gi.repository import GUPnPIgd gupnp_igd = GUPnPIgd.SimpleIgd() except ImportError: diff -r 88d74b9f4ea1 -r cee42c275cc2 src/common/passwords.py --- a/src/common/passwords.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/common/passwords.py Sat Jul 25 22:03:24 2015 +0200 @@ -30,6 +30,7 @@ from common import gajim from common import kwalletbinding from common.exceptions import GnomeKeyringError +import gi USER_HAS_LIBSECRET = False USER_HAS_GNOMEKEYRING = False @@ -253,6 +254,7 @@ if gajim.config.get('use_gnomekeyring'): global Secret try: + gi.require_version('Secret', '1') gir = __import__('gi.repository', globals(), locals(), ['Secret'], 0) Secret = gir.Secret diff -r 88d74b9f4ea1 -r cee42c275cc2 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/gtkgui_helpers.py Sat Jul 25 22:03:24 2015 +0200 @@ -28,6 +28,7 @@ ## import xml.sax.saxutils +import gi from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -732,6 +733,7 @@ gajim.config.set('check_if_gajim_is_default', False) try: + gi.require_version('GConf', '2.0') GConf = importlib.import_module('gi.repository.GConf') # in try because daemon may not be there client = GConf.Client.get_default() diff -r 88d74b9f4ea1 -r cee42c275cc2 src/notify.py --- a/src/notify.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/notify.py Sat Jul 25 22:03:24 2015 +0200 @@ -46,6 +46,8 @@ USER_HAS_PYNOTIFY = True # user has pynotify module try: + import gi + gi.require_version('Notify', '0.7') from gi.repository import Notify Notify.init('Gajim Notification') except ImportError:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2015