Commits

commits@gajim.org

17632 discussions

gajim: don't crash when we cannot connect to avahi. Fixes #7607
by Gajim 31 Dec '13

31 Dec '13

changeset 5abfcbebff64 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=5abfcbebff64 description: don't crash when we cannot connect to avahi. Fixes #7607 diffstat: src/common/zeroconf/connection_zeroconf.py | 1 + src/common/zeroconf/zeroconf_avahi.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diffs (28 lines): diff -r 8f86332529fd -r 5abfcbebff64 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Sun Dec 29 16:00:01 2013 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Tue Dec 31 14:28:24 2013 +0100 @@ -297,6 +297,7 @@ show=show)) else: # show notification that avahi or system bus is down + self.connected = 0 gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) self.status = 'offline' diff -r 8f86332529fd -r 5abfcbebff64 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Sun Dec 29 16:00:01 2013 +0100 +++ b/src/common/zeroconf/zeroconf_avahi.py Tue Dec 31 14:28:24 2013 +0100 @@ -284,9 +284,10 @@ state = self.server.GetState() if state == self.avahi.SERVER_RUNNING: - self.create_service() - self.announced = True - return True + if self.create_service(): + self.announced = True + return True + return False def remove_announce(self): if self.announced == False:

1 0

gajim: ignore address-related errors for getaddrinfo. Fixes #7611
by Gajim 30 Dec '13

30 Dec '13

changeset 7aa545860ae0 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7aa545860ae0 description: ignore address-related errors for getaddrinfo. Fixes #7611 cleanup of jingle_transport.py diffstat: src/common/jingle_transport.py | 79 +++++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 34 deletions(-) diffs (123 lines): diff -r fddb13e77a07 -r 7aa545860ae0 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Mon Dec 23 23:26:54 2013 +0100 +++ b/src/common/jingle_transport.py Fri Dec 27 12:16:58 2013 +0100 @@ -178,30 +178,39 @@ return if not self.connection: return - local_ip_cand = [] port = int(gajim.config.get('file_transfers_port')) #type preference of connection type. XEP-0260 section 2.2 type_preference = 126 - c = {'host': self.connection.peerhost[0]} - c['candidate_id'] = self.connection.connection.getAnID() - c['port'] = port - c['type'] = 'direct' - c['jid'] = self.ourjid - c['priority'] = (2**16) * type_preference + priority = (2**16) * type_preference + hosts = set() + local_ip_cand = [] + + c = {'host': self.connection.peerhost[0], + 'candidate_id': self.connection.connection.getAnID(), + 'port': port, + 'type': 'direct', + 'jid': self.ourjid, + 'priority': priority} + hosts.add(self.connection.peerhost[0]) local_ip_cand.append(c) - for addr in socket.getaddrinfo(socket.gethostname(), None): - if not addr[4][0] in local_ip_cand and not addr[4][0].startswith('127'): - c = {'host': addr[4][0]} - c['candidate_id'] = self.connection.connection.getAnID() - c['port'] = port - c['type'] = 'direct' - c['jid'] = self.ourjid - c['priority'] = (2**16) * type_preference - c['initiator'] = self.file_props.sender - c['target'] = self.file_props.receiver - local_ip_cand.append(c) + try: + for addrinfo in socket.getaddrinfo(socket.gethostname(), None): + addr = addrinfo[4][0] + if not addr in hosts and not addr.startswith('127'): + c = {'host': addr, + 'candidate_id': self.connection.connection.getAnID(), + 'port': port, + 'type': 'direct', + 'jid': self.ourjid, + 'priority': priority, + 'initiator': self.file_props.sender, + 'target': self.file_props.receiver} + hosts.add(addr) + local_ip_cand.append(c) + except socket.gaierror: + pass # ignore address-related errors for getaddrinfo self._add_candidates(local_ip_cand) @@ -209,6 +218,7 @@ if not self.connection: return type_preference = 126 + priority = (2**16) * type_preference additional_ip_cand = [] port = int(gajim.config.get('file_transfers_port')) ft_add_hosts = gajim.config.get('ft_add_hosts_to_send') @@ -216,14 +226,14 @@ if ft_add_hosts: hosts = [e.strip() for e in ft_add_hosts.split(',')] for h in hosts: - c = {'host': h} - c['candidate_id'] = self.connection.connection.getAnID() - c['port'] = port - c['type'] = 'direct' - c['jid'] = self.ourjid - c['priority'] = (2**16) * type_preference - c['initiator'] = self.file_props.sender - c['target'] = self.file_props.receiver + c = {'host': h, + 'candidate_id': self.connection.connection.getAnID(), + 'port': port, + 'type': 'direct', + 'jid': self.ourjid, + 'priority': priority, + 'initiator': self.file_props.sender, + 'target': self.file_props.receiver} additional_ip_cand.append(c) self._add_candidates(additional_ip_cand) @@ -232,6 +242,7 @@ if not self.connection: return type_preference = 10 + priority = (2**16) * type_preference proxy_cand = [] socks5conn = self.connection proxyhosts = socks5conn._get_file_transfer_proxies_from_config(self.file_props) @@ -240,14 +251,14 @@ self.file_props.proxyhosts = proxyhosts for proxyhost in proxyhosts: - c = {'host': proxyhost['host']} - c['candidate_id'] = self.connection.connection.getAnID() - c['port'] = int(proxyhost['port']) - c['type'] = 'proxy' - c['jid'] = proxyhost['jid'] - c['priority'] = (2**16) * type_preference - c['initiator'] = self.file_props.sender - c['target'] = self.file_props.receiver + c = {'host': proxyhost['host'], + 'candidate_id': self.connection.connection.getAnID(), + 'port': int(proxyhost['port']), + 'type': 'proxy', + 'jid': proxyhost['jid'], + 'priority': priority, + 'initiator': self.file_props.sender, + 'target': self.file_props.receiver} proxy_cand.append(c) self._add_candidates(proxy_cand)

1 0

gajim: Handle "NOTATION_NAME", "NOTATION_DATA" GPG lines. Fixes ...
by Gajim 30 Dec '13

30 Dec '13

changeset 55eca1db3e67 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=55eca1db3e67 description: Handle "NOTATION_NAME", "NOTATION_DATA" GPG lines. Fixes #7612 diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7aa545860ae0 -r 55eca1db3e67 src/common/gnupg.py --- a/src/common/gnupg.py Fri Dec 27 12:16:58 2013 +0100 +++ b/src/common/gnupg.py Fri Dec 27 12:42:19 2013 +0100 @@ -175,7 +175,7 @@ "PLAINTEXT_LENGTH", "POLICY_URL", "DECRYPTION_INFO", "DECRYPTION_OKAY", "INV_SGNR", "FILE_START", "FILE_ERROR", "FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC", - "GOODMDC", "NO_SGNR"): + "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA"): pass elif key == "BADSIG": self.valid = False

1 0

gajim: py2 -> py3
by Gajim 30 Dec '13

30 Dec '13

changeset 00cf0293b7a3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=00cf0293b7a3 description: py2 -> py3 diffstat: src/common/connection.py | 8 ++++---- src/common/connection_handlers_events.py | 4 ++-- src/common/jingle_xtls.py | 3 ++- src/gajim.py | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diffs (74 lines): diff -r 55eca1db3e67 -r 00cf0293b7a3 src/common/connection.py --- a/src/common/connection.py Fri Dec 27 12:42:19 2013 +0100 +++ b/src/common/connection.py Mon Dec 30 20:56:09 2013 +0100 @@ -1395,15 +1395,15 @@ text += _('\nSSL Error: <b>%s</b>') % ssl_error[errnum] else: text += _('\nUnknown SSL error: %d') % errnum - fingerprint = cert.digest('sha1') + fingerprint = cert.digest('sha1').decode('utf-8') pem = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, - cert) + cert).decode('utf-8') gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=text, error_num=errnum, cert=pem, fingerprint=fingerprint, certificate=cert)) return True if cert: - fingerprint = cert.digest('sha1') + fingerprint = cert.digest('sha1').decode('utf-8') saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: @@ -1420,7 +1420,7 @@ '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): pem = OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert) + OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') txt = _('The authenticity of the %s certificate could be ' 'invalid.\nThe certificate does not cover this domain.') %\ hostname diff -r 55eca1db3e67 -r 00cf0293b7a3 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Dec 27 12:42:19 2013 +0100 +++ b/src/common/connection_handlers_events.py Mon Dec 30 20:56:09 2013 +0100 @@ -1639,8 +1639,8 @@ if self.conn.connection.Connection.ssl_certificate: cert = self.conn.connection.Connection.ssl_certificate self.ssl_cert = OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert) - self.ssl_fingerprint = cert.digest('sha1') + OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') + self.ssl_fingerprint = cert.digest('sha1').decode('utf-8') return True class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent): diff -r 55eca1db3e67 -r 00cf0293b7a3 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Fri Dec 27 12:42:19 2013 +0100 +++ b/src/common/jingle_xtls.py Mon Dec 30 20:56:09 2013 +0100 @@ -289,7 +289,8 @@ os.chmod(filepath + '.pkey', 0600) f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key)) with open(filepath + '.cert', 'wb') as f: - f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert)) + f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode( + 'utf-8')) if __name__ == '__main__': diff -r 55eca1db3e67 -r 00cf0293b7a3 src/gajim.py --- a/src/gajim.py Fri Dec 27 12:42:19 2013 +0100 +++ b/src/gajim.py Mon Dec 30 20:56:09 2013 +0100 @@ -71,10 +71,10 @@ try: from distutils.version import LooseVersion as V if V(nbxmpp.__version__) < V("0.3"): - print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' + print('Gajim needs python-nbxmpp > 0.3 to run. Quiting...') sys.exit() except: - print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' + print('Gajim needs python-nbxmpp > 0.3 to run. Quiting...') sys.exit() #from common import demandimport

1 0

gajim: py2 -> py3
by Gajim 30 Dec '13

30 Dec '13

changeset c65d0ee0f558 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c65d0ee0f558 description: py2 -> py3 diffstat: src/common/connection_handlers_events.py | 2 +- src/common/crypto.py | 7 ++++--- src/common/jingle_content.py | 4 ++-- src/common/jingle_ft.py | 2 +- src/common/jingle_xtls.py | 2 +- src/common/socks5.py | 2 +- src/gui_interface.py | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diffs (102 lines): diff -r 00cf0293b7a3 -r c65d0ee0f558 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Dec 30 20:56:09 2013 +0100 +++ b/src/common/connection_handlers_events.py Mon Dec 30 21:19:15 2013 +0100 @@ -1216,7 +1216,7 @@ self.is_continued = False if invite_tag.getAttr('continue') == 'true': self.is_continued = True - else + else: self.room_jid = self.msg_obj.fjid item = self.msg_obj.invite_tag.getTag('invite') try: diff -r 00cf0293b7a3 -r c65d0ee0f558 src/common/crypto.py --- a/src/common/crypto.py Mon Dec 30 20:56:09 2013 +0100 +++ b/src/common/crypto.py Mon Dec 30 21:19:15 2013 +0100 @@ -87,7 +87,7 @@ os.environ, os.getcwd(), os.getpid()] for s in sources: - OpenSSL.rand.add(str(s), 0.01) + OpenSSL.rand.add(str(s).encode('utf-8'), 0.01) # On Windows add the current contents of the screen to the PRNG state. if os.name == 'nt': @@ -99,12 +99,13 @@ for d in dirs: if os.access(d, os.R_OK): for filename in os.listdir(d): - OpenSSL.rand.add(filename, 0) + OpenSSL.rand.add(filename.encode('utf-8'), 0) try: with open(d + os.sep + filename, "r") as fp: # Limit the ammount of read bytes, in case a memory # file was opened - OpenSSL.rand.add(str(fp.read(5000)), 0.01) + OpenSSL.rand.add(str(fp.read(5000)).encode('utf-8'), + 0.01) except: # Ignore all read and access errors pass diff -r 00cf0293b7a3 -r c65d0ee0f558 src/common/jingle_content.py --- a/src/common/jingle_content.py Mon Dec 30 20:56:09 2013 +0100 +++ b/src/common/jingle_content.py Mon Dec 30 21:19:15 2013 +0100 @@ -21,8 +21,8 @@ from common import gajim import nbxmpp from common.jingle_transport import JingleTransportIBB -from jingle_xtls import SELF_SIGNED_CERTIFICATE -from jingle_xtls import load_cert_file +from .jingle_xtls import SELF_SIGNED_CERTIFICATE +from .jingle_xtls import load_cert_file contents = {} diff -r 00cf0293b7a3 -r c65d0ee0f558 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Dec 30 20:56:09 2013 +0100 +++ b/src/common/jingle_ft.py Mon Dec 30 21:19:15 2013 +0100 @@ -22,7 +22,7 @@ import hashlib from common import gajim import nbxmpp -import jingle_xtls +from . import jingle_xtls from common.jingle_content import contents, JingleContent from common.jingle_transport import * from common import helpers diff -r 00cf0293b7a3 -r c65d0ee0f558 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Mon Dec 30 20:56:09 2013 +0100 +++ b/src/common/jingle_xtls.py Mon Dec 30 21:19:15 2013 +0100 @@ -286,7 +286,7 @@ req = createCertRequest(key, CN=CN) cert = createCertificate(req, req, key, 0, 0, 60*60*24*365*5) # five years with open(filepath + '.pkey', 'wb') as f: - os.chmod(filepath + '.pkey', 0600) + os.chmod(filepath + '.pkey', 0o600) f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key)) with open(filepath + '.cert', 'wb') as f: f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode( diff -r 00cf0293b7a3 -r c65d0ee0f558 src/common/socks5.py --- a/src/common/socks5.py Mon Dec 30 20:56:09 2013 +0100 +++ b/src/common/socks5.py Mon Dec 30 21:19:15 2013 +0100 @@ -494,7 +494,7 @@ self._sock.connect(self._server) self._send=self._sock.send self._recv=self._sock.recv - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError), e: + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError) as e: pass except Exception as ee: errnum = ee.errno diff -r 00cf0293b7a3 -r c65d0ee0f558 src/gui_interface.py --- a/src/gui_interface.py Mon Dec 30 20:56:09 2013 +0100 +++ b/src/gui_interface.py Mon Dec 30 21:19:15 2013 +0100 @@ -1971,7 +1971,7 @@ import imp imp.reload(emoticons) emots = emoticons.emoticons - except Exception, e: + except Exception as e: return True for emot_filename in emots: emot_file = os.path.join(path, emot_filename)

1 0

gajim: include needed files for snarl plugin in windows installer.
by Gajim 30 Dec '13

30 Dec '13

changeset f254a18e077e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=f254a18e077e description: include needed files for snarl plugin in windows installer. diffstat: build.bat | 3 +++ gajim.nsi | 8 ++++++++ setup_win32.py | 2 +- 3 files changed, 12 insertions(+), 1 deletions(-) diffs (77 lines): diff -r 463446445789 -r f254a18e077e build.bat --- a/build.bat Sat Dec 14 09:57:50 2013 +0100 +++ b/build.bat Mon Dec 16 13:18:39 2013 +0100 @@ -22,6 +22,9 @@ copy ..\LIBEAY32.dll bin copy ..\SSLEAY32.dll bin +REM for snarl plugin +xcopy ..\win32com bin\win32com /e /i + mkdir bin\gtk cd ../src/gtk hg archive ..\..\gajim_built\bin\gtk diff -r 463446445789 -r f254a18e077e gajim.nsi --- a/gajim.nsi Sat Dec 14 09:57:50 2013 +0100 +++ b/gajim.nsi Mon Dec 16 13:18:39 2013 +0100 @@ -182,8 +182,10 @@ File "bin\library.zip" File "bin\pangocairo.pyd" File "bin\pango.pyd" + File "bin\pycurl.pyd" File "bin\pyexpat.pyd" File "bin\python27.dll" + File "bin\pythoncom27.dll" File "bin\pywintypes27.dll" File "bin\OpenSSL.rand.pyd" File "bin\select.pyd" @@ -194,8 +196,10 @@ File "bin\win32api.pyd" File "bin\win32file.pyd" File "bin\win32pipe.pyd" + File "bin\win32ui.pyd" File "bin\winsound.pyd" File "msvcr90.dll" + File /r "bin\win32com" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" @@ -530,6 +534,7 @@ RMDir /r "$INSTDIR\bin\gtk\lib" RMDir /r "$INSTDIR\bin\gtk\share" RMDir "$INSTDIR\bin\gtk" + RMDir "$INSTDIR\bin\win32com" Delete "$INSTDIR\bin\_bsddb.pyd" Delete "$INSTDIR\bin\_ctypes.pyd" Delete "$INSTDIR\bin\_hashlib.pyd" @@ -558,8 +563,10 @@ Delete "$INSTDIR\bin\OpenSSL.SSL.pyd" Delete "$INSTDIR\bin\pango.pyd" Delete "$INSTDIR\bin\pangocairo.pyd" + Delete "$INSTDIR\bin\pycurl.pyd" Delete "$INSTDIR\bin\pyexpat.pyd" Delete "$INSTDIR\bin\python27.dll" + Delete "$INSTDIR\bin\pythoncom27.dll" Delete "$INSTDIR\bin\pywintypes27.dll" Delete "$INSTDIR\bin\select.pyd" Delete "$INSTDIR\bin\sqlite3.dll" @@ -568,6 +575,7 @@ Delete "$INSTDIR\bin\win32api.pyd" Delete "$INSTDIR\bin\win32file.pyd" Delete "$INSTDIR\bin\win32pipe.pyd" + Delete "$INSTDIR\bin\win32ui.pyd" Delete "$INSTDIR\bin\winsound.pyd" Delete "$INSTDIR\bin\msvcr90.dll" RMDir /r "$INSTDIR\bin" diff -r 463446445789 -r f254a18e077e setup_win32.py --- a/setup_win32.py Sat Dec 14 09:57:50 2013 +0100 +++ b/setup_win32.py Mon Dec 16 13:18:39 2013 +0100 @@ -33,7 +33,7 @@ 'build_exe': { 'includes': ['Gdk.KEY_, 'dumbdbm', 'dbhash', 'bsddb', 'new', 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', - 'numbers'], + 'numbers', 'win32com.client', 'win32com.server'], 'base': 'Win32GUI', 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',

1 0

gajim: Fix typo. Fixes #7598
by Gajim 30 Dec '13

30 Dec '13

changeset 6f71f6e40b19 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=6f71f6e40b19 description: Fix typo. Fixes #7598 diffstat: src/gui_menu_builder.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r f254a18e077e -r 6f71f6e40b19 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Mon Dec 16 13:18:39 2013 +0100 +++ b/src/gui_menu_builder.py Wed Dec 18 20:08:45 2013 +0400 @@ -182,7 +182,7 @@ gajim.gc_connected[account][r_jid]: rooms2.append((r_jid, account)) r_jids.append(r_jid) - + if not rooms2: return item = Gtk.SeparatorMenuItem.new() # separator @@ -445,7 +445,7 @@ bookmarked = False c_ = gajim.contacts.get_contact(account, gc_contact.jid, gc_contact.resource) - if c_ and c_.supports(nbxmpp.NS_CONFERENCE): + if c_ and c_.supports(NS_CONFERENCE): bookmarked=True build_invite_submenu(invite_menuitem, [(gc_contact, account)], show_bookmarked=bookmarked)

1 0

gajim: don't crash with new nbxmpp
by Gajim 30 Dec '13

30 Dec '13

changeset e575b06d2ddd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e575b06d2ddd description: don't crash with new nbxmpp diffstat: src/common/connection_handlers_events.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diffs (30 lines): diff -r 6f71f6e40b19 -r e575b06d2ddd src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Dec 18 20:08:45 2013 +0400 +++ b/src/common/connection_handlers_events.py Mon Dec 23 16:03:39 2013 +0100 @@ -40,6 +40,9 @@ from common.jingle_transport import JingleTransportSocks5 from common.file_props import FilesProp +if gajim.HAVE_PYOPENSSL: + import OpenSSL.crypto + import logging log = logging.getLogger('gajim.c.connection_handlers_events') @@ -1632,12 +1635,12 @@ self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ self.errnum) self.ssl_cert = '' - if len(self.conn.connection.Connection.ssl_cert_pem): - self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem self.ssl_fingerprint = '' if self.conn.connection.Connection.ssl_certificate: - self.ssl_fingerprint = \ - self.conn.connection.Connection.ssl_certificate.digest('sha1') + cert = self.conn.connection.Connection.ssl_certificate + self.ssl_cert = OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, cert) + self.ssl_fingerprint = cert.digest('sha1') return True class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent):

1 0

gajim: Gajim need latest nbxmpp version
by Gajim 30 Dec '13

30 Dec '13

changeset c749820e0225 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c749820e0225 description: Gajim need latest nbxmpp version diffstat: src/gajim.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diffs (19 lines): diff -r e575b06d2ddd -r c749820e0225 src/gajim.py --- a/src/gajim.py Mon Dec 23 16:03:39 2013 +0100 +++ b/src/gajim.py Mon Dec 23 16:56:58 2013 +0100 @@ -68,6 +68,15 @@ print('Gajim needs python-nbxmpp to run. Quiting...') sys.exit() +try: + from distutils.version import LooseVersion as V + if V(nbxmpp.__version__) < V("0.3"): + print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' + sys.exit() +except: + print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' + sys.exit() + #from common import demandimport #demandimport.enable() #demandimport.ignore += ['GObject._gobject', 'libasyncns', 'i18n',

1 0

gajim: hide some menuitems in private chat context menu. Fixes #...
by Gajim 30 Dec '13

30 Dec '13

changeset 9610e0253908 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=9610e0253908 description: hide some menuitems in private chat context menu. Fixes #7603 diffstat: src/gui_menu_builder.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r c749820e0225 -r 9610e0253908 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Mon Dec 23 16:56:58 2013 +0100 +++ b/src/gui_menu_builder.py Mon Dec 23 21:39:23 2013 +0100 @@ -382,6 +382,11 @@ if not control: items_to_hide.append(convert_to_gc_menuitem) + # Hide items when it's a pm + if gc_contact: + items_to_hide += [rename_menuitem, edit_groups_menuitem, + subscription_menuitem, remove_from_roster_menuitem] + for item in items_to_hide: item.set_no_show_all(True) item.hide()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits