Commits

commits@gajim.org

17632 discussions

gajim: migrate from kwalletbindings to libsecret too
by Gajim 18 Jul '15

18 Jul '15

changeset e8d44379f2de in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e8d44379f2de description: migrate from kwalletbindings to libsecret too diffstat: src/common/passwords.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (29 lines): diff -r edd83d9b41d2 -r e8d44379f2de src/common/passwords.py --- a/src/common/passwords.py Sat Jul 18 15:44:36 2015 +0200 +++ b/src/common/passwords.py Sat Jul 18 15:52:08 2015 +0200 @@ -168,8 +168,15 @@ def get_password(self, account_name): conf = gajim.config.get_per('accounts', account_name, 'password') - if conf is None or conf == '<kwallet>': + if conf is None: return None + if conf == '<kwallet>': + # Migrate from kwallet + if kwalletbinding.kwallet_available(): + kw_storage = KWalletPasswordStorage() + password = kw_storage.get_password(account_name) + self.save_password(account_name, password) + return password if conf.startswith('gnomekeyring:'): # migrate from libgnomekeyring GnomePasswordStorage @@ -188,7 +195,7 @@ except GnomeKeyringError: return None password = gk_storage.get_password(account_name) - save_password(account_name, password) + self.save_password(account_name, password) return password if not conf.startswith('libsecret:'): password = conf

1 0

gajim: use libsecret instead of libgnomekeyring when available
by Gajim 18 Jul '15

18 Jul '15

changeset edd83d9b41d2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=edd83d9b41d2 description: use libsecret instead of libgnomekeyring when available diffstat: src/common/passwords.py | 102 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 91 insertions(+), 11 deletions(-) diffs (134 lines): diff -r e1e80c648e4a -r edd83d9b41d2 src/common/passwords.py --- a/src/common/passwords.py Wed Jul 15 15:11:03 2015 +0200 +++ b/src/common/passwords.py Sat Jul 18 15:44:36 2015 +0200 @@ -31,10 +31,12 @@ from common import kwalletbinding from common.exceptions import GnomeKeyringError +USER_HAS_LIBSECRET = False USER_HAS_GNOMEKEYRING = False USER_USES_GNOMEKEYRING = False USER_HAS_KWALLETCLI = False GnomeKeyring = None +Secret = None class PasswordStorage(object): def get_password(self, account_name): @@ -154,6 +156,69 @@ if account_name in gajim.connections: gajim.connections[account_name].password = password +class SecretPasswordStorage(PasswordStorage): + def __init__(self): + self.GAJIM_SCHEMA = Secret.Schema.new("Gajim", + Secret.SchemaFlags.NONE, + { + 'user': Secret.SchemaAttributeType.STRING, + 'server': Secret.SchemaAttributeType.STRING, + } + ) + + def get_password(self, account_name): + conf = gajim.config.get_per('accounts', account_name, 'password') + if conf is None or conf == '<kwallet>': + return None + if conf.startswith('gnomekeyring:'): + # migrate from libgnomekeyring + GnomePasswordStorage + global GnomeKeyring + global USER_HAS_GNOMEKEYRING + if not USER_HAS_GNOMEKEYRING: + try: + gir = __import__('gi.repository', globals(), locals(), + ['GnomeKeyring'], 0) + GnomeKeyring = gir.GnomeKeyring + except (ImportError, AttributeError): + return False + USER_HAS_GNOMEKEYRING = True + try: + gk_storage = GnomePasswordStorage() + except GnomeKeyringError: + return None + password = gk_storage.get_password(account_name) + save_password(account_name, password) + return password + if not conf.startswith('libsecret:'): + password = conf + ## migrate the password over to keyring + try: + self.save_password(account_name, password, update=False) + except Exception: + ## no keyring daemon: in the future, stop using it + set_storage(SimplePasswordStorage()) + return password + server = gajim.config.get_per('accounts', account_name, 'hostname') + user = gajim.config.get_per('accounts', account_name, 'name') + password = Secret.password_lookup_sync(self.GAJIM_SCHEMA, {'user': user, + 'server': server}, None) + return password + + def save_password(self, account_name, password, update=True): + server = gajim.config.get_per('accounts', account_name, 'hostname') + user = gajim.config.get_per('accounts', account_name, 'name') + display_name = _('XMPP account %s@%s') % (user, server) + if password is None: + password = str() + attributes = {'user': user, 'server': server} + Secret.password_store_sync(self.GAJIM_SCHEMA, attributes, + Secret.COLLECTION_DEFAULT, display_name, password, None) + gajim.config.set_per('accounts', account_name, 'password', + 'libsecret:') + if account_name in gajim.connections: + gajim.connections[account_name].password = password + class KWalletPasswordStorage(PasswordStorage): def get_password(self, account_name): pw = gajim.config.get_per('accounts', account_name, 'password') @@ -198,21 +263,36 @@ global storage if storage is None: # None is only in first time get_storage is called if gajim.config.get('use_gnomekeyring'): - global GnomeKeyring + global Secret try: gir = __import__('gi.repository', globals(), locals(), - ['GnomeKeyring'], 0) - GnomeKeyring = gir.GnomeKeyring + ['Secret'], 0) + Secret = gir.Secret except (ImportError, AttributeError): - pass + global GnomeKeyring + try: + gir = __import__('gi.repository', globals(), locals(), + ['GnomeKeyring'], 0) + GnomeKeyring = gir.GnomeKeyring + except (ImportError, AttributeError): + pass + else: + global USER_HAS_GNOMEKEYRING + global USER_USES_GNOMEKEYRING + USER_HAS_GNOMEKEYRING = True + if GnomeKeyring.is_available(): + USER_USES_GNOMEKEYRING = True + else: + USER_USES_GNOMEKEYRING = False else: - global USER_HAS_GNOMEKEYRING - global USER_USES_GNOMEKEYRING - USER_HAS_GNOMEKEYRING = True - if GnomeKeyring.is_available(): - USER_USES_GNOMEKEYRING = True - else: - USER_USES_GNOMEKEYRING = False + global USER_HAS_LIBSECRET + USER_HAS_LIBSECRET = True + if USER_HAS_LIBSECRET: + try: + storage = SecretPasswordStorage() + return storage + except Exception: + storage = None if USER_USES_GNOMEKEYRING: try: storage = GnomePasswordStorage()

1 0

gajim: Correctly register gajim-remote with xmpp: URIs
by Gajim 17 Jul '15

17 Jul '15

changeset 05c09cbb1ecf 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=05c09cbb1ecf description: Correctly register gajim-remote with xmpp: URIs diffstat: data/gajim-remote.desktop.in.in | 11 +++++ data/gui/preferences_window.ui | 16 ------- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 2 +- po/br.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 4 +- po/eo.po | 2 +- po/es.po | 2 +- po/eu.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/kk.po | 2 +- po/lt.po | 4 +- po/nb.po | 2 +- po/nl.po | 2 +- po/no.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sr.po | 2 +- po/sr(a)Latn.po | 2 +- po/sv.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- src/common/config.py | 1 - src/common/gnupg.py | 1 + src/config.py | 7 --- src/gtkgui_helpers.py | 87 ----------------------------------------- src/gui_interface.py | 6 +- 43 files changed, 52 insertions(+), 153 deletions(-) diffs (truncated from 643 to 300 lines): diff -r 3897db63b8c5 -r 05c09cbb1ecf data/gajim-remote.desktop.in.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/gajim-remote.desktop.in.in Fri Jul 17 22:19:16 2015 +0200 @@ -0,0 +1,11 @@ +[Desktop Entry] +Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly; +_Name=Gajim Remote +_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip +Version=1.0 +Exec=gajim-remote handle_uri %u +TryExec=gajim-remote +StartupNotify=false +Terminal=false +Type=Application +MimeType=x-scheme-handler/xmpp diff -r 3897db63b8c5 -r 05c09cbb1ecf data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Tue Jul 14 21:39:05 2015 +0200 +++ b/data/gui/preferences_window.ui Fri Jul 17 22:19:16 2015 +0200 @@ -2753,22 +2753,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="check_default_client_checkbutton"> - <property name="label" translatable="yes">Check on startup if Gajim is the _default Jabber client</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_check_default_client_checkbutton_toggled"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> </object> </child> </object> diff -r 3897db63b8c5 -r 05c09cbb1ecf po/be.po --- a/po/be.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/be.po Fri Jul 17 22:19:16 2015 +0200 @@ -9451,7 +9451,7 @@ "адпраўлены на ўсе рахункі" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Апрацоўваць спасылкі xmpp:/" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/be(a)latin.po --- a/po/be(a)latin.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/be(a)latin.po Fri Jul 17 22:19:16 2015 +0200 @@ -9483,7 +9483,7 @@ "dasłany na ŭsie konty" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Absłuhoŭvaj spasyłki xmpp:/" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/bg.po --- a/po/bg.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/bg.po Fri Jul 17 22:19:16 2015 +0200 @@ -9403,7 +9403,7 @@ "акаунти" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Обработка на адрес тип xmpp://" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/br.po --- a/po/br.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/br.po Fri Jul 17 22:19:16 2015 +0200 @@ -9450,7 +9450,7 @@ msgstr "" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/cs.po --- a/po/cs.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/cs.po Fri Jul 17 22:19:16 2015 +0200 @@ -9316,7 +9316,7 @@ "ze všech účtů" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Obsluhovat xmpp:/ uri" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/da.po --- a/po/da.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/da.po Fri Jul 17 22:19:16 2015 +0200 @@ -9347,7 +9347,7 @@ "blive sendt til alle kontoer" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Håndter en xmpp:/ uri" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/de.po --- a/po/de.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/de.po Fri Jul 17 22:19:16 2015 +0200 @@ -9448,7 +9448,7 @@ "Avatar allen Konten zugewiesen" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Verarbeite einen xmpp:/-URI" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/el.po --- a/po/el.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/el.po Fri Jul 17 22:19:16 2015 +0200 @@ -9546,7 +9546,7 @@ #: ../src/gajim-remote.py:278 #, fuzzy -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Το URI \"%s\" δεν είναι έγκυρο." #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/en_GB.po --- a/po/en_GB.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/en_GB.po Fri Jul 17 22:19:16 2015 +0200 @@ -9283,8 +9283,8 @@ "all accounts" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" -msgstr "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" +msgstr "Handle a xmpp: uri" #: ../src/gajim-remote.py:280 msgid "?CLI:uri" diff -r 3897db63b8c5 -r 05c09cbb1ecf po/eo.po --- a/po/eo.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/eo.po Fri Jul 17 22:19:16 2015 +0200 @@ -9447,7 +9447,7 @@ "kontoj" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Prilabori xmpp:/ uri" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/es.po --- a/po/es.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/es.po Fri Jul 17 22:19:16 2015 +0200 @@ -9249,7 +9249,7 @@ "el avatar en todas las cuentas" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Manejar una uri xmpp:/" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/eu.po --- a/po/eu.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/eu.po Fri Jul 17 22:19:16 2015 +0200 @@ -9469,7 +9469,7 @@ "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/fr.po --- a/po/fr.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/fr.po Fri Jul 17 22:19:16 2015 +0200 @@ -9332,7 +9332,7 @@ "envoyé à tous les comptes" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Gère une URI du type xmpp:" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/gl.po --- a/po/gl.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/gl.po Fri Jul 17 22:19:16 2015 +0200 @@ -9506,7 +9506,7 @@ "a todas as contas" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/he.po --- a/po/he.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/he.po Fri Jul 17 22:19:16 2015 +0200 @@ -9525,7 +9525,7 @@ #: ../src/gajim-remote.py:278 #, fuzzy -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "cli" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/hr.po --- a/po/hr.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/hr.po Fri Jul 17 22:19:16 2015 +0200 @@ -9339,7 +9339,7 @@ "na sve račune" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Rukuj xmpp:/ adresama" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/hu.po --- a/po/hu.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/hu.po Fri Jul 17 22:19:16 2015 +0200 @@ -9490,7 +9490,7 @@ "be set for all accounts" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Egy xmpp:/ uri kezelése" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/it.po --- a/po/it.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/it.po Fri Jul 17 22:19:16 2015 +0200 @@ -9329,7 +9329,7 @@ "verrà impostato per tutti gli account" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Gestisci un uri xmpp:/" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/ja.po --- a/po/ja.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/ja.po Fri Jul 17 22:19:16 2015 +0200 @@ -9203,7 +9203,7 @@ "に設定されます" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "xmpp:/ の URI を取り扱います" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/kk.po --- a/po/kk.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/kk.po Fri Jul 17 22:19:16 2015 +0200 @@ -9251,7 +9251,7 @@ "орнатылады" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "\"xmpp:/\" түріндегі сілтемені өңдеу" #: ../src/gajim-remote.py:280 diff -r 3897db63b8c5 -r 05c09cbb1ecf po/lt.po --- a/po/lt.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/lt.po Fri Jul 17 22:19:16 2015 +0200 @@ -9071,8 +9071,8 @@ "all accounts" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" -msgstr "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" +msgstr "Handle a xmpp: uri" #: ../src/gajim-remote.py:280 msgid "?CLI:uri" diff -r 3897db63b8c5 -r 05c09cbb1ecf po/nb.po --- a/po/nb.po Tue Jul 14 21:39:05 2015 +0200 +++ b/po/nb.po Fri Jul 17 22:19:16 2015 +0200

1 0

python-nbxmpp: Added tag nbxmpp-0.5.3 for changeset dfe253b19bef
by Python-nbxmpp 16 Jul '15

16 Jul '15

changeset cd50e6d917aa in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=cd50e6d917aa description: Added tag nbxmpp-0.5.3 for changeset dfe253b19bef diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r dfe253b19bef -r cd50e6d917aa .hgtags --- a/.hgtags Thu Jul 16 21:09:50 2015 +0200 +++ b/.hgtags Thu Jul 16 21:11:51 2015 +0200 @@ -5,3 +5,4 @@ 70c9ac0c2b9bd3786df85d921c7f0a54fa6c92b4 nbxmpp-0.5 3576e23060992c7157b070faae0cb69dbb981079 nbxmpp-0.5.1 3026969b524fb04723eb973e4a951adb2140d6a9 nbxmpp-0.5.2 +dfe253b19bef8cf1efe214f693d2fabf9f132c0f nbxmpp-0.5.3

1 0

python-nbxmpp: prepare 0.5.3 release
by Python-nbxmpp 16 Jul '15

16 Jul '15

changeset dfe253b19bef in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=dfe253b19bef description: prepare 0.5.3 release diffstat: ChangeLog | 6 ++++++ nbxmpp/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diffs (34 lines): diff -r 1ac6e9a303a7 -r dfe253b19bef ChangeLog --- a/ChangeLog Sat Jun 20 07:54:12 2015 -0400 +++ b/ChangeLog Thu Jul 16 21:09:50 2015 +0200 @@ -1,3 +1,9 @@ +python-nbxmpp 0.5.3 (13 July 2015) + + * Fix receiving long utf8 strings under py3 + * Fix issue with pyopenssl 0.15.1 + * Fix decoding issues + python-nbxmpp 0.5.2 (27 December 2014) * Fix BOSH HTTP requests diff -r 1ac6e9a303a7 -r dfe253b19bef nbxmpp/__init__.py --- a/nbxmpp/__init__.py Sat Jun 20 07:54:12 2015 -0400 +++ b/nbxmpp/__init__.py Thu Jul 16 21:09:50 2015 +0200 @@ -17,4 +17,4 @@ from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.5.2" +__version__ = "0.5.3" diff -r 1ac6e9a303a7 -r dfe253b19bef setup.py --- a/setup.py Sat Jun 20 07:54:12 2015 -0400 +++ b/setup.py Thu Jul 16 21:09:50 2015 +0200 @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.5.2', + version='0.5.3', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org',

1 0

gajim: remove the Ctrl-F -> send file shortcut in one window mod...
by Gajim 15 Jul '15

15 Jul '15

changeset 8b54c4d7731a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8b54c4d7731a description: remove the Ctrl-F -> send file shortcut in one window mode. Fixes #7831 diffstat: src/message_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 7946575b0726 -r 8b54c4d7731a src/message_window.py --- a/src/message_window.py Mon Jul 13 21:39:12 2015 +0200 +++ b/src/message_window.py Tue Jul 14 14:11:06 2015 +0200 @@ -368,6 +368,10 @@ # theme if not Gtk.Settings.get_default().get_property( 'gtk-key-theme-name') == 'Emacs': + if gajim.interface.msg_win_mgr.mode == \ + gajim.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: + gajim.interface.roster.tree.grab_focus() + return False control._on_send_file_menuitem_activate(None) return True elif control.type_id == message_control.TYPE_CHAT and \

1 0

gajim: [moparisthebest] Encrypt GPG message to recipient and to ...
by Gajim 15 Jul '15

15 Jul '15

changeset 7946575b0726 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7946575b0726 description: [moparisthebest] Encrypt GPG message to recipient and to our own key so that we can decrypt it later and use carbon. Fixes #7616 diffstat: src/common/connection.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (25 lines): diff -r c67a57b9f754 -r 7946575b0726 src/common/connection.py --- a/src/common/connection.py Mon Jul 13 15:42:33 2015 +0200 +++ b/src/common/connection.py Mon Jul 13 21:39:12 2015 +0200 @@ -313,9 +313,11 @@ error = _('The contact\'s key (%s) does not match the key assigned ' 'in Gajim.' % keyID[:8]) else: + myKeyID = gajim.config.get_per('accounts', self.name, 'keyid') def encrypt_thread(msg, keyID, always_trust=False): # encrypt message. This function returns (msgenc, error) - return self.gpg.encrypt(msg, [keyID], always_trust) + return self.gpg.encrypt(msg, [keyID, myKeyID], + always_trust) def _on_encrypted(output): msgenc, error = output if error == 'NOT_TRUSTED': @@ -423,8 +425,6 @@ if msgenc: msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) - if self.carbons_enabled: - msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) msg_iq.addChild(name='no-permanent-storage', namespace=nbxmpp.NS_MSG_HINTS)

1 0

gajim: make autojoined room as minimized too. Fixes #7856
by Gajim 15 Jul '15

15 Jul '15

changeset 908812c58ca9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=908812c58ca9 description: make autojoined room as minimized too. Fixes #7856 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8b54c4d7731a -r 908812c58ca9 src/dialogs.py --- a/src/dialogs.py Tue Jul 14 14:11:06 2015 +0200 +++ b/src/dialogs.py Tue Jul 14 14:19:24 2015 +0200 @@ -2680,7 +2680,7 @@ # Add as bookmark, with autojoin and not minimized name = gajim.get_nick_from_jid(room_jid) gajim.interface.add_gc_bookmark(self.account, name, room_jid, - autojoin, '0', password, nickname) + autojoin, autojoin, password, nickname) if self.automatic: gajim.automatic_rooms[self.account][room_jid] = self.automatic

1 0

gajim: make windon listen on ipv4 + ipv6 for zeroconf. Fixes #8007
by Gajim 15 Jul '15

15 Jul '15

changeset dccd760c487b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=dccd760c487b description: make windon listen on ipv4 + ipv6 for zeroconf. Fixes #8007 diffstat: src/common/zeroconf/client_zeroconf.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (24 lines): diff -r 908812c58ca9 -r dccd760c487b src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Tue Jul 14 14:19:24 2015 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Tue Jul 14 21:39:05 2015 +0200 @@ -30,6 +30,7 @@ import socket import errno import sys +import os import string from random import Random @@ -71,6 +72,12 @@ self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) + if os.name == 'nt': + ver = os.sys.getwindowsversion() + if (ver[3], ver[0]) == (2, 6): # Win Vista + + # 47 is socket.IPPROTO_IPV6 + # 27 is socket.IPV6_V6ONLY under windows, but not defined ... + self._serv.setsockopt(41, 27, 0) # will fail when port is busy, or we don't have rights to bind try: self._serv.bind((ai[4][0], self.port))

1 0

gajim: fix import
by Gajim 15 Jul '15

15 Jul '15

changeset e1e80c648e4a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e1e80c648e4a description: fix import diffstat: src/common/helpers.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r dccd760c487b -r e1e80c648e4a src/common/helpers.py --- a/src/common/helpers.py Tue Jul 14 21:39:05 2015 +0200 +++ b/src/common/helpers.py Wed Jul 15 15:11:03 2015 +0200 @@ -35,8 +35,7 @@ import os import subprocess import urllib -import urllib -from urlparse import urlparse +from urllib.parse import urlparse import webbrowser import errno import select

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