Commits

commits@gajim.org

17632 discussions

gajim: update die to nbxmpp update
by Gajim 06 Dec '13

06 Dec '13

changeset 331e9e05a879 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=331e9e05a879 description: update die to nbxmpp update diffstat: src/common/connection.py | 63 ++++++++++++++++--------------- src/common/connection_handlers_events.py | 15 +++---- src/common/gajim.py | 11 +++++ 3 files changed, 51 insertions(+), 38 deletions(-) diffs (145 lines): diff -r 12172377f128 -r 331e9e05a879 src/common/connection.py --- a/src/common/connection.py Fri Dec 06 21:29:25 2013 +0100 +++ b/src/common/connection.py Fri Dec 06 21:20:22 2013 +0100 @@ -61,6 +61,9 @@ from common import check_X509 from connection_handlers import * +if gajim.HAVE_PYOPENSSL: + import OpenSSL.crypto + from nbxmpp import Smacks from string import Template import logging @@ -1382,49 +1385,49 @@ try: errnum = con.Connection.ssl_errnum except AttributeError: - errnum = [] # we don't have an errnum - for i, er in enumerate(errnum): - if er > 0 and str(er) not in gajim.config.get_per('accounts', - self.name, 'ignore_ssl_errors').split(): - text = _('The authenticity of the %s certificate could be ' - 'invalid.') % hostname - if er in ssl_error: - text += _('\nSSL Error: %s') % ssl_error[er] - else: - text += _('\nUnknown SSL error: %d') % er - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=text, error_num=er, - cert=con.Connection.ssl_cert_pem[i], - fingerprint=con.Connection.ssl_fingerprint_sha1[i], - certificate=con.Connection.ssl_certificate[i])) - return True - if con.Connection.ssl_fingerprint_sha1: + errnum = 0 + cert = con.Connection.ssl_certificate + if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts', + self.name, 'ignore_ssl_errors').split(): + text = _('The authenticity of the %s certificate could be invlid') \ + % hostname + if errnum in ssl_error: + text += _('\nSSL Error: %s') % ssl_error[errnum] + else: + text += _('\nUnknown SSL error: %d') % errnum + fingerprint = cert.digest('sha1') + pem = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, + cert) + 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') saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: # Check sha1 fingerprint - if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: + if fingerprint != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, - certificate=con.Connection.ssl_certificate[-1], - new_fingerprint=con.Connection.ssl_fingerprint_sha1[ - -1])) + conn=self, certificate=con.Connection.ssl_certificate, + new_fingerprint=fingerprint)) return True else: gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', - con.Connection.ssl_fingerprint_sha1[-1]) - if not check_X509.check_certificate(con.Connection.ssl_certificate[ - -1], hostname) and '100' not in gajim.config.get_per('accounts', + 'ssl_fingerprint_sha1', fingerprint) + if not check_X509.check_certificate(con.Connection.ssl_certificate, + hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): + fingerprint = cert.digest('sha1') + pem = OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, cert) txt = _('The authenticity of the %s certificate could be ' 'invalid.\nThe certificate does not cover this domain.') % \ hostname gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=txt, error_num=100, - cert=con.Connection.ssl_cert_pem[-1], - fingerprint=con.Connection.ssl_fingerprint_sha1[-1], - certificate=con.Connection.ssl_certificate[-1])) + error_text=txt, error_num=100, cert=pem, + fingerprint=fingerprint, certificate=cert)) return True self._register_handlers(con, con_type) diff -r 12172377f128 -r 331e9e05a879 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Dec 06 21:29:25 2013 +0100 +++ b/src/common/connection_handlers_events.py Fri Dec 06 21:20:22 2013 +0100 @@ -1600,20 +1600,19 @@ try: self.errnum = self.conn.connection.Connection.ssl_errnum except AttributeError: - self.errnum = [] # we don't have an errnum + self.errnum = 0 # we don't have an errnum self.ssl_msg = '' - for er in self.errnum: - if er > 0: - from common.connection import ssl_error - self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ - er) + if self.errnum > 0: + from common.connection import ssl_error + 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 len(self.conn.connection.Connection.ssl_fingerprint_sha1): + if self.conn.connection.Connection.ssl_certificate: self.ssl_fingerprint = \ - self.conn.connection.Connection.ssl_fingerprint_sha1 + self.conn.connection.Connection.ssl_certificate.digest('sha1') return True class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent): diff -r 12172377f128 -r 331e9e05a879 src/common/gajim.py --- a/src/common/gajim.py Fri Dec 06 21:29:25 2013 +0100 +++ b/src/common/gajim.py Fri Dec 06 21:20:22 2013 +0100 @@ -172,6 +172,17 @@ if subprocess.call(gpg_cmd, shell=True): HAVE_GPG = False +HAVE_PYOPENSSL = True +try: + import OpenSSL.SSL + import OpenSSL.crypto + ver = OpenSSL.__version__ + ver_l = [int(i) for i in ver.split('.')] + if ver_l < [0, 12]: + raise ImportError +except Exception: + HAVE_PYOPENSSL = False + HAVE_FARSTREAM = True try: farstream = __import__('farstream')

1 0

gajim: minor code improvement
by Gajim 06 Dec '13

06 Dec '13

changeset 441998315d53 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=441998315d53 description: minor code improvement diffstat: src/common/connection.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 8bd293727c0e -r 441998315d53 src/common/connection.py --- a/src/common/connection.py Sun Nov 03 17:57:12 2013 +0100 +++ b/src/common/connection.py Fri Dec 06 21:27:53 2013 +0100 @@ -1383,8 +1383,7 @@ errnum = con.Connection.ssl_errnum except AttributeError: errnum = [] # we don't have an errnum - i = 0 - for er in errnum: + for i, er in enumerate(errnum): if er > 0 and str(er) not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): text = _('The authenticity of the %s certificate could be '

1 0

gajim: missing change
by Gajim 06 Dec '13

06 Dec '13

changeset 12172377f128 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=12172377f128 description: missing change diffstat: src/common/connection.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 441998315d53 -r 12172377f128 src/common/connection.py --- a/src/common/connection.py Fri Dec 06 21:27:53 2013 +0100 +++ b/src/common/connection.py Fri Dec 06 21:29:25 2013 +0100 @@ -1398,7 +1398,6 @@ fingerprint=con.Connection.ssl_fingerprint_sha1[i], certificate=con.Connection.ssl_certificate[i])) return True - i += 1 if con.Connection.ssl_fingerprint_sha1: saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1')

1 0

gajim: update die to nbxmpp update
by Gajim 06 Dec '13

06 Dec '13

changeset 4468727118ea 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=4468727118ea description: update die to nbxmpp update diffstat: src/common/connection.py | 63 ++++++++++++++++--------------- src/common/connection_handlers_events.py | 15 +++---- src/common/gajim.py | 11 +++++ 3 files changed, 51 insertions(+), 38 deletions(-) diffs (145 lines): diff -r d680fe1aa4fd -r 4468727118ea src/common/connection.py --- a/src/common/connection.py Fri Dec 06 12:25:34 2013 +0400 +++ b/src/common/connection.py Fri Dec 06 21:20:22 2013 +0100 @@ -61,6 +61,9 @@ from common import check_X509 from connection_handlers import * +if gajim.HAVE_PYOPENSSL: + import OpenSSL.crypto + from nbxmpp import Smacks from string import Template import logging @@ -1382,49 +1385,49 @@ try: errnum = con.Connection.ssl_errnum except AttributeError: - errnum = [] # we don't have an errnum - for i, er in enumerate(errnum): - if er > 0 and str(er) not in gajim.config.get_per('accounts', - self.name, 'ignore_ssl_errors').split(): - text = _('The authenticity of the %s certificate could be ' - 'invalid.') % hostname - if er in ssl_error: - text += _('\nSSL Error: %s') % ssl_error[er] - else: - text += _('\nUnknown SSL error: %d') % er - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=text, error_num=er, - cert=con.Connection.ssl_cert_pem[i], - fingerprint=con.Connection.ssl_fingerprint_sha1[i], - certificate=con.Connection.ssl_certificate[i])) - return True - if con.Connection.ssl_fingerprint_sha1: + errnum = 0 + cert = con.Connection.ssl_certificate + if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts', + self.name, 'ignore_ssl_errors').split(): + text = _('The authenticity of the %s certificate could be invlid') \ + % hostname + if errnum in ssl_error: + text += _('\nSSL Error: %s') % ssl_error[errnum] + else: + text += _('\nUnknown SSL error: %d') % errnum + fingerprint = cert.digest('sha1') + pem = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, + cert) + 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') saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: # Check sha1 fingerprint - if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: + if fingerprint != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, - certificate=con.Connection.ssl_certificate[-1], - new_fingerprint=con.Connection.ssl_fingerprint_sha1[ - -1])) + conn=self, certificate=con.Connection.ssl_certificate, + new_fingerprint=fingerprint)) return True else: gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', - con.Connection.ssl_fingerprint_sha1[-1]) - if not check_X509.check_certificate(con.Connection.ssl_certificate[ - -1], hostname) and '100' not in gajim.config.get_per('accounts', + 'ssl_fingerprint_sha1', fingerprint) + if not check_X509.check_certificate(con.Connection.ssl_certificate, + hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): + fingerprint = cert.digest('sha1') + pem = OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, cert) txt = _('The authenticity of the %s certificate could be ' 'invalid.\nThe certificate does not cover this domain.') % \ hostname gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=txt, error_num=100, - cert=con.Connection.ssl_cert_pem[-1], - fingerprint=con.Connection.ssl_fingerprint_sha1[-1], - certificate=con.Connection.ssl_certificate[-1])) + error_text=txt, error_num=100, cert=pem, + fingerprint=fingerprint, certificate=cert)) return True self._register_handlers(con, con_type) diff -r d680fe1aa4fd -r 4468727118ea src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Dec 06 12:25:34 2013 +0400 +++ b/src/common/connection_handlers_events.py Fri Dec 06 21:20:22 2013 +0100 @@ -1626,20 +1626,19 @@ try: self.errnum = self.conn.connection.Connection.ssl_errnum except AttributeError: - self.errnum = [] # we don't have an errnum + self.errnum = 0 # we don't have an errnum self.ssl_msg = '' - for er in self.errnum: - if er > 0: - from common.connection import ssl_error - self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ - er) + if self.errnum > 0: + from common.connection import ssl_error + 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 len(self.conn.connection.Connection.ssl_fingerprint_sha1): + if self.conn.connection.Connection.ssl_certificate: self.ssl_fingerprint = \ - self.conn.connection.Connection.ssl_fingerprint_sha1 + self.conn.connection.Connection.ssl_certificate.digest('sha1') return True class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent): diff -r d680fe1aa4fd -r 4468727118ea src/common/gajim.py --- a/src/common/gajim.py Fri Dec 06 12:25:34 2013 +0400 +++ b/src/common/gajim.py Fri Dec 06 21:20:22 2013 +0100 @@ -172,6 +172,17 @@ if subprocess.call(gpg_cmd, shell=True): HAVE_GPG = False +HAVE_PYOPENSSL = True +try: + import OpenSSL.SSL + import OpenSSL.crypto + ver = OpenSSL.__version__ + ver_l = [int(i) for i in ver.split('.')] + if ver_l < [0, 12]: + raise ImportError +except Exception: + HAVE_PYOPENSSL = False + HAVE_FARSTREAM = True try: farstream = __import__('farstream')

1 0

python-nbxmpp: store only depth 0 certificate, and don't store f...
by Yann Leboulanger 06 Dec '13

06 Dec '13

changeset 2d6e5d6949e8 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=2d6e5d6949e8 description: store only depth 0 certificate, and don't store fingerprint and pem. Fixes #11 diffstat: nbxmpp/bosh.py | 6 ++---- nbxmpp/tls_nb.py | 8 +++----- nbxmpp/transports_nb.py | 6 ++---- 3 files changed, 7 insertions(+), 13 deletions(-) diffs (50 lines): diff -r e88ec6cb0884 -r 2d6e5d6949e8 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Sat Nov 30 11:29:05 2013 +0100 +++ b/nbxmpp/bosh.py Fri Dec 06 21:19:37 2013 +0100 @@ -90,10 +90,8 @@ self.proxy_dict['credentials'] = self.proxy_creds # ssl variables - self.ssl_fingerprint_sha1 = [] - self.ssl_certificate = [] - self.ssl_errnum = [] - self.ssl_cert_pem = [] + self.ssl_certificate = None + self.ssl_errnum = None def connect(self, conn_5tuple, on_connect, on_connect_failure): diff -r e88ec6cb0884 -r 2d6e5d6949e8 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sat Nov 30 11:29:05 2013 +0100 +++ b/nbxmpp/tls_nb.py Fri Dec 06 21:19:37 2013 +0100 @@ -446,11 +446,9 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: - self._owner.ssl_fingerprint_sha1.append(cert.digest('sha1')) - self._owner.ssl_certificate.append(cert) - self._owner.ssl_errnum.append(errnum) - self._owner.ssl_cert_pem.append(OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert)) + if depth == 0: + self._owner.ssl_certificate = cert + self._owner.ssl_errnum = errnum return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True) diff -r e88ec6cb0884 -r 2d6e5d6949e8 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Nov 30 11:29:05 2013 +0100 +++ b/nbxmpp/transports_nb.py Fri Dec 06 21:19:37 2013 +0100 @@ -313,10 +313,8 @@ self.on_remote_disconnect = self.disconnect # ssl variables - self.ssl_fingerprint_sha1 = [] - self.ssl_certificate = [] - self.ssl_errnum = [] - self.ssl_cert_pem = [] + self.ssl_certificate = None + self.ssl_errnum = None # FIXME: transport should not be aware xmpp def start_disconnect(self):

1 0

gajim: Fix crash when try configure plugin second time. See http...
by Gajim 06 Dec '13

06 Dec '13

changeset d680fe1aa4fd in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d680fe1aa4fd description: Fix crash when try configure plugin second time. See https://trac-plugins.gajim.org/ticket/86 diffstat: src/plugins/gui.py | 5 +++++ 1 файлов изменено, 5 вставок(+), 0 удалений(-) различия (22 строк): diff -r 698c643887cb -r d680fe1aa4fd src/plugins/gui.py --- a/src/plugins/gui.py Thu Dec 05 22:34:12 2013 +0100 +++ b/src/plugins/gui.py Fri Dec 06 12:25:34 2013 +0400 @@ -322,6 +322,10 @@ self.init() + def on_close_dialog(self, widget, data): + self.hide() + return True + def on_close_button_clicked(self, widget): self.hide() @@ -330,6 +334,7 @@ self.set_transient_for(parent) self.on_run() self.show_all() + self.connect('delete-event', self.on_close_dialog) result = super(GajimPluginConfigDialog, self) return result

1 0

gajim-plugins: FlashingKeyboardPlugin. Fix close button. Fixes #86
by Gajim Plugins 06 Dec '13

06 Dec '13

changeset e0c3177c3021 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=e0c3177c3021 description: FlashingKeyboardPlugin. Fix close button. Fixes #86 diffstat: flashing_keyboard/flashing_keyboard.py | 1 + 1 файлов изменено, 1 вставок(+), 0 удалений(-) различия (8 строк): diff -r 6c24c2596aba -r e0c3177c3021 flashing_keyboard/flashing_keyboard.py --- a/flashing_keyboard/flashing_keyboard.py Sun Nov 24 16:49:06 2013 +0400 +++ b/flashing_keyboard/flashing_keyboard.py Fri Dec 06 11:10:16 2013 +0400 @@ -109,3 +109,4 @@ self.plugin.config['flash'] = not widget.get_active() if self.isactive: gajim.plugin_manager.activate_plugin(self.plugin) + self.hide()

1 0

gajim: [mazzeppanell] updated italian translation
by Gajim 05 Dec '13

05 Dec '13

changeset 698c643887cb 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=698c643887cb description: [mazzeppanell] updated italian translation diffstat: po/it.po | 2467 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 1178 insertions(+), 1289 deletions(-) diffs (truncated from 6192 to 300 lines): diff -r f0dce43a7cb1 -r 698c643887cb po/it.po --- a/po/it.po Wed Dec 04 18:43:28 2013 +0100 +++ b/po/it.po Thu Dec 05 22:34:12 2013 +0100 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-23 22:34+0200\n" -"PO-Revision-Date: 2013-10-09 22:46+0100\n" +"POT-Creation-Date: 2013-12-05 22:32+0100\n" +"PO-Revision-Date: 2013-11-15 20:10+0100\n" "Last-Translator: v <noway(a)insiberia.net>\n" "Language-Team: Italian <>\n" "Language: it\n" @@ -31,12 +31,15 @@ msgstr "Eventi _Personali" #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 +#: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat..." msgstr "_Inizia Conversazione..." -#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 -msgid "Join _Group Chat..." -msgstr "Entra in una Conversazione di _Gruppo..." +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5 +#: ../data/gui/systray_context_menu.ui.h:3 +msgid "Join _Group Chat" +msgstr "Entra in una Conversazione di _Gruppo" #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." @@ -55,8 +58,9 @@ msgstr "_Apri Posta Ricevuta Gmail" #: ../data/gui/account_context_menu.ui.h:9 -msgid "_Modify Account" -msgstr "_Modifica Account" +#: ../data/gui/zeroconf_context_menu.ui.h:2 +msgid "_Modify Account..." +msgstr "_Modifica Account..." #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" @@ -177,13 +181,13 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272 -#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 -#: ../src/config.py:1747 ../src/config.py:2341 ../src/config.py:2422 -#: ../src/config.py:2437 ../src/config.py:3718 ../src/config.py:3793 +#: ../src/config.py:1258 ../src/config.py:1273 ../src/config.py:1278 +#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1748 +#: ../src/config.py:1753 ../src/config.py:2348 ../src/config.py:2430 +#: ../src/config.py:2445 ../src/config.py:3740 ../src/config.py:3815 #: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 -#: ../src/dialogs.py:537 ../src/roster_window.py:3147 -#: ../src/roster_window.py:3153 ../src/roster_window.py:3158 +#: ../src/dialogs.py:537 ../src/roster_window.py:3158 +#: ../src/roster_window.py:3164 ../src/roster_window.py:3169 msgid "None" msgstr "Nessuno" @@ -192,26 +196,25 @@ msgstr "Account" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3530 -#: ../src/dialogs.py:3576 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3534 +#: ../src/dialogs.py:3580 msgid "Add" msgstr "Aggiungi" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3534 -#: ../src/dialogs.py:3631 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3538 +#: ../src/dialogs.py:3635 msgid "Delete" msgstr "Elimina" -#. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5799 +#: ../data/gui/accounts_window.ui.h:5 msgid "Re_name" msgstr "Ri_nomina" -#. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 -msgid "_Enable" -msgstr "_Abilita" +#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4188 +#: ../src/plugins/gui.py:92 +msgid "Active" +msgstr "Attivo" #: ../data/gui/accounts_window.ui.h:7 msgid "Anonymous authentication" @@ -359,8 +362,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 -#: ../src/roster_window.py:3089 ../src/roster_window.py:4215 -#: ../src/roster_window.py:5849 +#: ../src/roster_window.py:3100 ../src/roster_window.py:4226 +#: ../src/roster_window.py:5871 msgid "General" msgstr "Generale" @@ -420,8 +423,8 @@ msgid "Connection" msgstr "Connessione" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840 -#: ../src/config.py:2438 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1846 +#: ../src/config.py:2446 msgid "No key selected" msgstr "Nessuna chiave selezionata" @@ -495,7 +498,7 @@ msgstr "E-mail:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1873 #: ../src/dialogs.py:842 msgid "Jabber ID:" msgstr "ID Jabber: " @@ -506,7 +509,7 @@ #: ../data/gui/add_new_contact_window.ui.h:1 msgid "Add New Contact" -msgstr "Aggiungi nuovo contatto" +msgstr "Aggiungi Nuovo Contatto" #: ../data/gui/add_new_contact_window.ui.h:2 msgid "A_ccount:" @@ -523,7 +526,7 @@ #: ../data/gui/add_new_contact_window.ui.h:5 #: ../data/gui/manage_bookmarks_window.ui.h:5 msgid "_Nickname:" -msgstr "_Soprannome:" +msgstr "_Nickname:" #: ../data/gui/add_new_contact_window.ui.h:6 msgid "_Group:" @@ -583,7 +586,6 @@ msgstr "Controlla ancora" #: ../data/gui/adhoc_commands_window.ui.h:5 -#, fuzzy msgid "Please wait while the command is being sent..." msgstr "Attendere durante l'invio del comando..." @@ -627,7 +629,6 @@ "abbiano effetto" #: ../data/gui/advanced_configuration_window.ui.h:5 -#, fuzzy msgid "_Reset to default" msgstr "_Reimposta ai colori predefiniti" @@ -737,7 +738,7 @@ #: ../data/gui/atom_entry_window.ui.h:6 msgid "Next entry" -msgstr "" +msgstr "Voce successiva" #: ../data/gui/blocked_contacts_window.ui.h:1 msgid "Blocked Contacts" @@ -745,8 +746,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5818 -#: ../src/roster_window.py:5945 ../src/roster_window.py:6082 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:665 +#: ../src/roster_window.py:5840 ../src/roster_window.py:5974 msgid "_Unblock" msgstr "_Sblocca" @@ -820,14 +821,9 @@ #: ../data/gui/chat_context_menu.ui.h:5 #: ../data/gui/subscription_request_popup_menu.ui.h:1 -#: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat" msgstr "_Inizia Conversazione" -#: ../data/gui/chat_context_menu.ui.h:6 -msgid "Join _Group Chat" -msgstr "Entra in una Conversazione di _Gruppo" - #: ../data/gui/chat_context_menu.ui.h:7 #: ../data/gui/contact_context_menu.ui.h:24 msgid "_Add to Roster..." @@ -843,78 +839,75 @@ #: ../data/gui/chat_control.ui.h:3 msgid "Invite contacts to the conversation (Ctrl+G)" -msgstr "Invita dei contatti nella conversazione (Ctrl+G)" +msgstr "Invita dei contatti alla conversazione (Ctrl+G)" #: ../data/gui/chat_control.ui.h:4 -#, fuzzy msgid "View contact information (Ctrl+I)" -msgstr "Invita dei contatti nella conversazione (Ctrl+G)" +msgstr "Visualizza informazioni sul contatto (Ctrl+I)" #: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6 msgid "Browse the chat history (Ctrl+H)" msgstr "Sfoglia la cronologia delle conversazioni (Ctrl+H)" #: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7 -#, fuzzy msgid "Show advanced functions (Alt+D)" -msgstr "Mostra un menù di funzioni avanzate (Alt+D)" +msgstr "Mostra funzioni avanzate (Alt+D)" #: ../data/gui/chat_control.ui.h:7 msgid "#" msgstr "#" #: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8 +#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322 +msgid "_Send" +msgstr "_Invia" + +#: ../data/gui/chat_control.ui.h:9 ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/single_message_window.ui.h:6 msgid "Send message" msgstr "Invia messaggio" -#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) -#: ../data/gui/chat_control.ui.h:10 ../data/gui/groupchat_control.ui.h:10 -#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322 -msgid "_Send" -msgstr "_Invia" - -#: ../data/gui/chat_control.ui.h:11 +#: ../data/gui/chat_control.ui.h:10 msgid "1" msgstr "1" -#: ../data/gui/chat_control.ui.h:12 +#: ../data/gui/chat_control.ui.h:11 msgid "2" msgstr "2" -#: ../data/gui/chat_control.ui.h:13 +#: ../data/gui/chat_control.ui.h:12 msgid "3" msgstr "3" -#: ../data/gui/chat_control.ui.h:14 +#: ../data/gui/chat_control.ui.h:13 msgid "4" msgstr "4" -#: ../data/gui/chat_control.ui.h:15 +#: ../data/gui/chat_control.ui.h:14 msgid "5" msgstr "5" -#: ../data/gui/chat_control.ui.h:16 +#: ../data/gui/chat_control.ui.h:15 msgid "6" msgstr "6" -#: ../data/gui/chat_control.ui.h:17 +#: ../data/gui/chat_control.ui.h:16 msgid "7" msgstr "7" -#: ../data/gui/chat_control.ui.h:18 +#: ../data/gui/chat_control.ui.h:17 msgid "8" msgstr "8" -#: ../data/gui/chat_control.ui.h:19 +#: ../data/gui/chat_control.ui.h:18 msgid "9" msgstr "9" -#: ../data/gui/chat_control.ui.h:20 +#: ../data/gui/chat_control.ui.h:19 msgid "*" msgstr "*" -#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3 +#: ../data/gui/chat_control.ui.h:20 ../data/gui/single_message_window.ui.h:3 msgid "0" msgstr "0" @@ -946,7 +939,9 @@

1 0

gajim: both sender and receiver request remote SSL certificate, ...
by Gajim 04 Dec '13

04 Dec '13

changeset f0dce43a7cb1 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=f0dce43a7cb1 description: both sender and receiver request remote SSL certificate, but only if it's a new one. Correctly verify remote SSL certificate. diffstat: src/common/connection_handlers_events.py | 7 ++- src/common/jingle_content.py | 21 ++++++-- src/common/jingle_ft.py | 37 ++++++++++++---- src/common/jingle_transport.py | 3 +- src/common/jingle_xtls.py | 70 +++++++++++++++++++++---------- src/common/protocol/bytestream.py | 16 +++++-- src/common/socks5.py | 46 +++++++++++++++----- src/gui_interface.py | 3 + 8 files changed, 143 insertions(+), 60 deletions(-) diffs (truncated from 507 to 300 lines): diff -r dff50cb9cd04 -r f0dce43a7cb1 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Dec 02 12:17:32 2013 +0100 +++ b/src/common/connection_handlers_events.py Wed Dec 04 18:43:28 2013 +0100 @@ -2052,8 +2052,11 @@ self.fjid = self.conn._ft_get_from(self.stanza) self.jid = gajim.get_jid_without_resource(self.fjid) if self.jingle_content: - self.FT_content.use_security = bool(self.jingle_content.getTag( - 'security')) + secu = self.jingle_content.getTag('security') + self.FT_content.use_security = bool(secu) + fingerprint = secu.getTag('fingerprint') + if fingerprint: + self.FT_content.x509_fingerprint = fingerprint.getData() if not self.FT_content.transport: self.FT_content.transport = JingleTransportSocks5() self.FT_content.transport.set_our_jid( diff -r dff50cb9cd04 -r f0dce43a7cb1 src/common/jingle_content.py --- a/src/common/jingle_content.py Mon Dec 02 12:17:32 2013 +0100 +++ b/src/common/jingle_content.py Wed Dec 04 18:43:28 2013 +0100 @@ -17,9 +17,12 @@ Handles Jingle contents (XEP 0166) """ +import os import gajim import nbxmpp from jingle_transport import JingleTransportIBB +from jingle_xtls import SELF_SIGNED_CERTIFICATE +from jingle_xtls import load_cert_file contents = {} @@ -213,12 +216,18 @@ if self.use_security: security = nbxmpp.simplexml.Node( tag=nbxmpp.NS_JINGLE_XTLS + ' security') - # TODO: add fingerprint element - for m in ('x509', ): # supported authentication methods - method = nbxmpp.simplexml.Node(tag='method') - method.setAttr('name', m) - security.addChild(node=method) - content.addChild(node=security) + certpath = os.path.join(gajim.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE)\ + + '.cert' + cert = load_cert_file(certpath) + if cert: + digest_algo = cert.get_signature_algorithm().split('With')[0] + security.addChild('fingerprint').addData(cert.digest( + digest_algo)) + for m in ('x509', ): # supported authentication methods + method = nbxmpp.simplexml.Node(tag='method') + method.setAttr('name', m) + security.addChild(node=method) + content.addChild(node=security) content.addChild(node=description_node) def destroy(self): diff -r dff50cb9cd04 -r f0dce43a7cb1 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Dec 02 12:17:32 2013 +0100 +++ b/src/common/jingle_ft.py Wed Dec 04 18:43:28 2013 +0100 @@ -22,6 +22,7 @@ import hashlib import gajim import nbxmpp +import jingle_xtls from jingle_content import contents, JingleContent from jingle_transport import * from common import helpers @@ -68,6 +69,7 @@ self.callbacks['transport-info'] += [self.__on_transport_info] self.callbacks['iq-result'] += [self.__on_iq_result] self.use_security = use_security + self.x509_fingerprint = None self.file_props = file_props self.weinitiate = self.session.weinitiate self.werequest = self.session.werequest @@ -164,17 +166,37 @@ h.addHash(hash_, self.file_props.algo) return h + def on_cert_received(self): + self.session.approve_session() + self.session.approve_content('file', name=self.name) + def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept") con = self.session.connection + # We ack the session accept + response = stanza.buildReply('result') + response.delChild(response.getQuery()) + con.connection.send(response) security = content.getTag('security') if not security: # responder can not verify our fingerprint self.use_security = False + else: + fingerprint = security.getTag('fingerprint') + if fingerprint: + fingerprint = fingerprint.getData() + self.x509_fingerprint = fingerprint + if not jingle_xtls.check_cert(gajim.get_jid_without_resource( + self.session.responder), fingerprint): + id_ = jingle_xtls.send_cert_request(con, + self.session.responder) + jingle_xtls.key_exchange_pend(id_, + self.continue_session_accept, [stanza]) + raise nbxmpp.NodeProcessed + self.continue_session_accept(stanza) + + def continue_session_accept(self, stanza): + con = self.session.connection if self.state == STATE_TRANSPORT_REPLACE: - # We ack the session accept - response = stanza.buildReply('result') - response.delChild(response.getQuery()) - con.connection.send(response) # If we are requesting we don't have the file if self.session.werequest: raise nbxmpp.NodeProcessed @@ -185,16 +207,13 @@ # Calculate file hash in a new thread # if we haven't sent the hash already. if self.file_props.hash_ is None and self.file_props.algo and \ - not self.werequest: + not self.werequest: self.hashThread = threading.Thread(target=self.__send_hash) self.hashThread.start() for host in self.file_props.streamhosts: host['initiator'] = self.session.initiator host['target'] = self.session.responder host['sid'] = self.file_props.sid - response = stanza.buildReply('result') - response.delChild(response.getQuery()) - con.connection.send(response) fingerprint = None if self.use_security: fingerprint = 'client' @@ -203,7 +222,7 @@ self.file_props.sid, self.on_connect, self._on_connect_error, fingerprint=fingerprint, receiving=False) - return + raise nbxmpp.NodeProcessed self.__state_changed(STATE_TRANSFERING) raise nbxmpp.NodeProcessed diff -r dff50cb9cd04 -r f0dce43a7cb1 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Mon Dec 02 12:17:32 2013 +0100 +++ b/src/common/jingle_transport.py Wed Dec 04 18:43:28 2013 +0100 @@ -156,7 +156,8 @@ candidates.append(cand) # we need this when we construct file_props on session-initiation - self.remote_candidates = candidates + if candidates: + self.remote_candidates = candidates return candidates diff -r dff50cb9cd04 -r f0dce43a7cb1 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Mon Dec 02 12:17:32 2013 +0100 +++ b/src/common/jingle_xtls.py Wed Dec 04 18:43:28 2013 +0100 @@ -26,15 +26,17 @@ PYOPENSSL_PRESENT = False -pending_contents = {} # key-exchange id -> session, accept that session once key-exchange completes +# key-exchange id -> [callback, args], accept that session once key-exchange completes +pending_contents = {} -def key_exchange_pend(id_, content): - pending_contents[id_] = content +def key_exchange_pend(id_, cb, args): + # args is a list + pending_contents[id_] = [cb, args] def approve_pending_content(id_): - content = pending_contents[id_] - content.session.approve_session() - content.session.approve_content('file', name=content.name) + cb = pending_contents[id_][0] + args = pending_contents[id_][1] + cb(*args) try: import OpenSSL.SSL @@ -57,18 +59,18 @@ log.info("certificate: %s" % certificate) return return_code -def load_cert_file(cert_path, cert_store): +def load_cert_file(cert_path, cert_store=None): """ This is almost identical to the one in nbxmpp.tls_nb """ if not os.path.isfile(cert_path): - return + return None try: f = open(cert_path) except IOError, e: log.warning('Unable to open certificate file %s: %s' % (cert_path, str(e))) - return + return None lines = f.readlines() i = 0 begin = -1 @@ -80,7 +82,9 @@ try: x509cert = OpenSSL.crypto.load_certificate( OpenSSL.crypto.FILETYPE_PEM, cert) - cert_store.add_cert(x509cert) + if cert_store: + cert_store.add_cert(x509cert) + return x509cert except OpenSSL.crypto.Error, exception_obj: log.warning('Unable to load a certificate from file %s: %s' %\ (cert_path, exception_obj.args[0][0][2])) @@ -90,7 +94,7 @@ begin = -1 i += 1 -def get_context(fingerprint, verify_cb=None): +def get_context(fingerprint, verify_cb=None, remote_jid=None): """ constructs and returns the context objects """ @@ -130,22 +134,28 @@ % (default_dh_params_name, err)) raise - store = ctx.get_cert_store() - for f in os.listdir(os.path.expanduser(gajim.MY_PEER_CERTS_PATH)): - load_cert_file(os.path.join(os.path.expanduser( - gajim.MY_PEER_CERTS_PATH), f), store) - log.debug('certificate file ' + f + ' loaded fingerprint ' + \ - fingerprint) + if remote_jid: + store = ctx.get_cert_store() + path = os.path.join(os.path.expanduser(gajim.MY_PEER_CERTS_PATH), + remote_jid) + '.cert' + if os.path.exists(path): + load_cert_file(path, cert_store=store) + log.debug('certificate file ' + path + ' loaded fingerprint ' + \ + fingerprint) return ctx -def send_cert(con, jid_from, sid): - certpath = os.path.join(gajim.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) + \ - '.cert' +def read_cert(certpath): certfile = open(certpath, 'r') certificate = '' for line in certfile.readlines(): if not line.startswith('-'): certificate += line + return certificate + +def send_cert(con, jid_from, sid): + certpath = os.path.join(gajim.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) + \ + '.cert' + certificate = read_cert(certpath) iq = nbxmpp.Iq('result', to=jid_from); iq.setAttr('id', sid) @@ -175,9 +185,21 @@ f.write('-----BEGIN CERTIFICATE-----\n') f.write(cert) f.write('-----END CERTIFICATE-----\n') + f.close() approve_pending_content(id_) +def check_cert(jid, fingerprint): + certpath = os.path.join(os.path.expanduser(gajim.MY_PEER_CERTS_PATH), jid) + certpath += '.cert' + if os.path.exists(certpath): + cert = load_cert_file(certpath) + if cert: + digest_algo = cert.get_signature_algorithm().split('With')[0] + if cert.digest(digest_algo) == fingerprint: + return True + return False + def send_cert_request(con, to_jid): iq = nbxmpp.Iq('get', to=to_jid) id_ = con.connection.getAnID() @@ -201,12 +223,12 @@ pkey.generate_key(type, bits) return pkey -def createCertRequest(pkey, digest="sha1", **name): +def createCertRequest(pkey, digest="sha256", **name): """ Create a certificate request. Arguments: pkey - The key to associate with the request - digest - Digestion method to use for signing, default is sha1 + digest - Digestion method to use for signing, default is sha256

1 0

gajim: show bookmarked rooms in invite to menu when possible. Fi...
by Gajim 02 Dec '13

02 Dec '13

changeset dff50cb9cd04 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=dff50cb9cd04 description: show bookmarked rooms in invite to menu when possible. Fixes #4455 diffstat: src/groupchat_control.py | 9 +++++- src/gui_menu_builder.py | 60 ++++++++++++++++++++++++++++++++++++++++++----- src/roster_window.py | 24 ++++++++++++++---- 3 files changed, 78 insertions(+), 15 deletions(-) diffs (202 lines): diff -r 0206274033da -r dff50cb9cd04 src/groupchat_control.py --- a/src/groupchat_control.py Sun Dec 01 10:06:38 2013 +0100 +++ b/src/groupchat_control.py Mon Dec 02 12:17:32 2013 +0100 @@ -42,6 +42,7 @@ import vcard import cell_renderer_image import dataforms_widget +import nbxmpp from common import gajim from common import helpers @@ -2500,9 +2501,13 @@ muc_icon = gtkgui_helpers.load_icon('muc_active') if muc_icon: item.set_image(muc_icon) - if c.jid and c.name != self.nick: + if jid and c.name != self.nick: + bookmarked = False + contact = gajim.contacts.get_contact(self.account, jid, c.resource) + if contact and contact.supports(nbxmpp.NS_CONFERENCE): + bookmarked=True gui_menu_builder.build_invite_submenu(item, ((c, self.account),), - ignore_rooms=[self.room_jid]) + ignore_rooms=[self.room_jid], show_bookmarked=bookmarked) else: item.set_sensitive(False) diff -r 0206274033da -r dff50cb9cd04 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sun Dec 01 10:06:38 2013 +0100 +++ b/src/gui_menu_builder.py Mon Dec 02 12:17:32 2013 +0100 @@ -26,7 +26,7 @@ from common import gajim from common import helpers from nbxmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC, NS_ESESSION -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER +from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER, NS_CONFERENCE def build_resources_submenu(contacts, account, action, room_jid=None, room_account=None, cap=None): @@ -63,7 +63,8 @@ return sub_menu -def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[]): +def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[], +show_bookmarked=False): """ list_ in a list of (contact, account) """ @@ -150,7 +151,9 @@ item = gtk.SeparatorMenuItem() # separator invite_to_submenu.append(item) for (room_jid, account) in rooms: - menuitem = gtk.MenuItem(room_jid.split('@')[0]) + menuitem = gtk.ImageMenuItem(room_jid.split('@')[0]) + muc_active_icon = gtkgui_helpers.load_icon('muc_active') + menuitem.set_image(muc_active_icon) if len(contact_list) > 1: # several resources menuitem.set_submenu(build_resources_submenu( contact_list, account, roster.on_invite_to_room, room_jid, @@ -162,9 +165,45 @@ else: resource = None menuitem.connect('activate', roster.on_invite_to_room, list_, - room_jid, account, resource) + room_jid, account, resource) invite_to_submenu.append(menuitem) + if not show_bookmarked: + return + rooms2 = [] # a list of (room_jid, account) tuple + r_jids = [] # list of room jids + for account in connected_accounts: + for room in gajim.connections[account].bookmarks: + r_jid = room['jid'] + if r_jid in r_jids: + continue + if r_jid not in gajim.gc_connected[account] or not \ + gajim.gc_connected[account][r_jid]: + rooms2.append((r_jid, account)) + r_jids.append(r_jid) + + if not rooms2: + return + item = gtk.SeparatorMenuItem() # separator + invite_to_submenu.append(item) + for (room_jid, account) in rooms2: + menuitem = gtk.ImageMenuItem(room_jid.split('@')[0]) + muc_inactive_icon = gtkgui_helpers.load_icon('muc_inactive') + menuitem.set_image(muc_inactive_icon) + if len(contact_list) > 1: # several resources + menuitem.set_submenu(build_resources_submenu( + contact_list, account, roster.on_invite_to_room, room_jid, + account)) + else: + # use resource if it's self contact + if contact.jid == gajim.get_jid_from_account(account): + resource = contact.resource + else: + resource = None + menuitem.connect('activate', roster.on_invite_to_room, list_, + room_jid, account, resource) + invite_to_submenu.append(menuitem) + def get_contact_menu(contact, account, use_multiple_contacts=True, show_start_chat=True, show_encryption=False, show_buttonbar_items=True, control=None, gc_contact=None, is_anonymous=True): @@ -402,9 +441,16 @@ # it's a pm and we don't know real JID invite_menuitem.set_sensitive(False) else: - build_invite_submenu(invite_menuitem, [(gc_contact, account)]) + bookmarked = False + c_ = gajim.contacts.get_contact(account, gc_contact.jid, + gc_contact.resource) + if c_ and c_.supports(nbxmpp.NS_CONFERENCE): + bookmarked=True + build_invite_submenu(invite_menuitem, [(gc_contact, account)], + show_bookmarked=bookmarked) else: - build_invite_submenu(invite_menuitem, [(contact, account)]) + build_invite_submenu(invite_menuitem, [(contact, account)], + show_bookmarked=contact.supports(NS_CONFERENCE)) if gajim.account_is_disconnected(account): invite_menuitem.set_sensitive(False) @@ -651,4 +697,4 @@ menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() - return menu \ No newline at end of file + return menu diff -r 0206274033da -r dff50cb9cd04 src/roster_window.py --- a/src/roster_window.py Sun Dec 01 10:06:38 2013 +0100 +++ b/src/roster_window.py Mon Dec 02 12:17:32 2013 +0100 @@ -70,7 +70,7 @@ if dbus_support.supported: import dbus -from nbxmpp.protocol import NS_FILE, NS_ROSTERX +from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE from common.pep import MOODS, ACTIVITIES #(icon, name, type, jid, account, editable, second pixbuf) @@ -5715,9 +5715,10 @@ group = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') - list_ = [] # list of (jid, account) tuples - list_online = [] # list of (jid, account) tuples - + list_ = [] # list of (contact, account) tuples + list_online = [] # list of (contact, account) tuples + + show_bookmarked = True group = model[titer][C_JID] for jid in gajim.contacts.get_jid_list(account): contact = gajim.contacts.get_contact_with_highest_priority(account, @@ -5725,6 +5726,9 @@ if group in contact.get_shown_groups(): if contact.show not in ('offline', 'error'): list_online.append((contact, account)) + # Check that all contacts support direct NUC invite + if not contact.supports(NS_CONFERENCE): + show_bookmarked = False list_.append((contact, account)) menu = gtk.Menu() @@ -5768,7 +5772,8 @@ if muc_icon: invite_menuitem.set_image(muc_icon) - gui_menu_builder.build_invite_submenu(invite_menuitem, list_online) + gui_menu_builder.build_invite_submenu(invite_menuitem, list_online, + show_bookmarked=show_bookmarked) menu.append(invite_menuitem) # Send Custom Status @@ -5917,6 +5922,12 @@ account = None break account = current_account + show_bookmarked = True + for (contact, current_account) in list_: + # Check that all contacts support direct NUC invite + if not contact.supports(NS_CONFERENCE): + show_bookmarked = False + break if account is not None: send_group_message_item = gtk.ImageMenuItem( _('Send Group M_essage')) @@ -5932,7 +5943,8 @@ if muc_icon: invite_item.set_image(muc_icon) - gui_menu_builder.build_invite_submenu(invite_item, list_) + gui_menu_builder.build_invite_submenu(invite_item, list_, + show_bookmarked=show_bookmarked) menu.append(invite_item) item = gtk.SeparatorMenuItem() # separator

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