Commits

commits@gajim.org

17632 discussions

gajim: fix mam implementation
by Gajim 02 Jan '15

02 Jan '15

changeset aa62e34444e9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=aa62e34444e9 description: fix mam implementation diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 942be189562d -r aa62e34444e9 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Dec 27 16:44:05 2014 +0100 +++ b/src/common/connection_handlers.py Mon Dec 29 19:13:12 2014 +0100 @@ -1472,7 +1472,8 @@ def cleanup(self): ConnectionHandlersBase.cleanup(self) ConnectionCaps.cleanup(self) - ConnectionArchive.cleanup(self) + ConnectionArchive136.cleanup(self) + ConnectionArchive313.cleanup(self) ConnectionPubSub.cleanup(self) gajim.ged.remove_event_handler('http-auth-received', ged.CORE, self._nec_http_auth_received)

1 0

gajim: sort accounts in accounts window
by Gajim 02 Jan '15

02 Jan '15

changeset ef153a5700d3 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=ef153a5700d3 description: sort accounts in accounts window diffstat: src/config.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 2dc6bce0eddc -r ef153a5700d3 src/config.py --- a/src/config.py Mon Dec 29 19:13:12 2014 +0100 +++ b/src/config.py Fri Jan 02 13:36:29 2015 +0100 @@ -1610,7 +1610,9 @@ self.current_account = None model = self.accounts_treeview.get_model() model.clear() - for account in gajim.config.get_per('accounts'): + list_ = gajim.config.get_per('accounts') + list_.sort() + for account in list_: iter_ = model.append() model.set(iter_, 0, account)

1 0

gajim: fix mam implementation
by Gajim 29 Dec '14

29 Dec '14

changeset 2dc6bce0eddc 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=2dc6bce0eddc description: fix mam implementation diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 01fa8c480f4c -r 2dc6bce0eddc src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Dec 29 16:09:27 2014 +0100 +++ b/src/common/connection_handlers.py Mon Dec 29 19:13:12 2014 +0100 @@ -1474,7 +1474,8 @@ def cleanup(self): ConnectionHandlersBase.cleanup(self) ConnectionCaps.cleanup(self) - ConnectionArchive.cleanup(self) + ConnectionArchive136.cleanup(self) + ConnectionArchive313.cleanup(self) ConnectionPubSub.cleanup(self) gajim.ged.remove_event_handler('http-auth-received', ged.CORE, self._nec_http_auth_received)

1 0

gajim: [Dominik George] updated german translation
by Gajim 29 Dec '14

29 Dec '14

changeset 01fa8c480f4c 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=01fa8c480f4c description: [Dominik George] updated german translation diffstat: po/de.po | 2478 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 1231 insertions(+), 1247 deletions(-) diffs (truncated from 6549 to 300 lines): diff -r b935d0950064 -r 01fa8c480f4c po/de.po --- a/po/de.po Sat Dec 27 16:44:05 2014 +0100 +++ b/po/de.po Mon Dec 29 16:09:27 2014 +0100 @@ -7,13 +7,14 @@ # Sebastian Schäfer <sarek(a)uliweb.de>, 2007. # Nico Gulden <cilugnedon(a)gmx.de>, 2007, 2008, 2009, 2010. # Niklas Hambüchen <nh2(a)deditus.de>, 2009. +# Dominik George <nik(a)naturalnet.de>, 2014. msgid "" msgstr "" "Project-Id-Version: gajim 0.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-29 15:27+0200\n" +"POT-Creation-Date: 2014-12-29 16:07+0100\n" "PO-Revision-Date: 2010-08-03 22:43+0200\n" -"Last-Translator: Nico Gulden <cilugnedon(a)gmx.de>\n" +"Last-Translator: Dominik George <nik(a)naturalnet.de>\n" "Language-Team: German <translators(a)gajim.org>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -32,12 +33,15 @@ msgstr "_Persönliche Ereignisse" #: ../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 "_Chat starten …" -#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 -msgid "Join _Group Chat..." -msgstr "_Gruppenchat betreten …" +#: ../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 "_Chatraum betreten …" #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." @@ -56,8 +60,9 @@ msgstr "Google-Mail-Posteingang _öffnen" #: ../data/gui/account_context_menu.ui.h:9 -msgid "_Modify Account" -msgstr "Konto _bearbeiten" +#: ../data/gui/zeroconf_context_menu.ui.h:2 +msgid "_Modify Account..." +msgstr "_Konto bearbeiten …" #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" @@ -178,13 +183,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:2339 ../src/config.py:2420 -#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 -#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 -#: ../src/dialogs.py:536 ../src/roster_window.py:3147 -#: ../src/roster_window.py:3153 ../src/roster_window.py:3158 +#: ../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:2356 ../src/config.py:2438 +#: ../src/config.py:2453 ../src/config.py:3748 ../src/config.py:3823 +#: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 +#: ../src/dialogs.py:537 ../src/roster_window.py:3185 +#: ../src/roster_window.py:3191 ../src/roster_window.py:3196 msgid "None" msgstr "Kein Proxy" @@ -193,26 +198,25 @@ msgstr "Konten" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524 -#: ../src/dialogs.py:3570 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3534 +#: ../src/dialogs.py:3580 msgid "Add" msgstr "Hinzufügen" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528 -#: ../src/dialogs.py:3625 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3538 +#: ../src/dialogs.py:3635 msgid "Delete" msgstr "Löschen" -#. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792 +#: ../data/gui/accounts_window.ui.h:5 msgid "Re_name" msgstr "_Umbenennen" -#. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 -msgid "_Enable" -msgstr "Aktivi_eren" +#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4196 +#: ../src/plugins/gui.py:92 +msgid "Active" +msgstr "Aktiv" #: ../data/gui/accounts_window.ui.h:7 msgid "Anonymous authentication" @@ -346,10 +350,14 @@ "entsprechend geändert." #: ../data/gui/accounts_window.ui.h:35 +msgid "Receive conversations from other resources (If server supports it)" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:36 msgid "Use file transfer proxies" msgstr "Dateiübertragungs-Proxys verwenden" -#: ../data/gui/accounts_window.ui.h:36 +#: ../data/gui/accounts_window.ui.h:37 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." @@ -358,34 +366,35 @@ "Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen Dateiübertragung " "erhöht wird." +#. nick choosen by contact #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. 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:115 ../src/dialogs.py:127 -#: ../src/roster_window.py:3089 ../src/roster_window.py:4215 -#: ../src/roster_window.py:5842 +#: ../data/gui/accounts_window.ui.h:38 ../data/gui/preferences_window.ui.h:41 +#: ../src/common/contacts.py:102 ../src/common/contacts.py:135 +#: ../src/dialogs.py:116 ../src/dialogs.py:128 ../src/roster_window.py:3127 +#: ../src/roster_window.py:4257 ../src/roster_window.py:5902 msgid "General" msgstr "Allgemein" -#: ../data/gui/accounts_window.ui.h:38 +#: ../data/gui/accounts_window.ui.h:39 msgid "_use HTTP__PROXY environment variable" msgstr "Umgebungsvariable HTTP__PROXY ben_utzen" -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134 +#: ../data/gui/accounts_window.ui.h:40 ../data/gui/preferences_window.ui.h:134 msgid "_Manage..." msgstr "_Verwalten …" -#: ../data/gui/accounts_window.ui.h:40 +#: ../data/gui/accounts_window.ui.h:41 msgid "Proxy" msgstr "Proxy" -#: ../data/gui/accounts_window.ui.h:41 +#: ../data/gui/accounts_window.ui.h:42 msgid "_Warn before using an insecure connection" msgstr "_Warnen, bevor eine unsichere Verbindung verwendet wird" -#: ../data/gui/accounts_window.ui.h:42 +#: ../data/gui/accounts_window.ui.h:43 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." @@ -393,11 +402,11 @@ "Falls aktiviert, fragt Gajim nach, bevor das Passwort über eine unsichere " "Verbindung gesendet wird." -#: ../data/gui/accounts_window.ui.h:43 +#: ../data/gui/accounts_window.ui.h:44 msgid "Send _keep-alive packets" msgstr "_Keepalive-Pakete senden" -#: ../data/gui/accounts_window.ui.h:44 +#: ../data/gui/accounts_window.ui.h:45 msgid "" "If checked, Gajim will send keep-alive packets to prevent connection timeout " "which results in disconnection" @@ -405,79 +414,79 @@ "Falls aktiviert, sendet Gajim regelmäßig Keepalive-Pakete, um einen " "Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern." -#: ../data/gui/accounts_window.ui.h:45 +#: ../data/gui/accounts_window.ui.h:46 msgid "Use cust_om hostname/port" msgstr "Benutzerdefinierten Rechnernamen und P_ort verwenden" -#: ../data/gui/accounts_window.ui.h:46 +#: ../data/gui/accounts_window.ui.h:47 msgid "_Hostname: " msgstr "Rec_hnername: " -#: ../data/gui/accounts_window.ui.h:47 +#: ../data/gui/accounts_window.ui.h:48 msgid "_Port: " msgstr "_Port: " -#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138 +#: ../data/gui/accounts_window.ui.h:49 ../data/gui/preferences_window.ui.h:138 msgid "Miscellaneous" msgstr "Verschiedenes" -#: ../data/gui/accounts_window.ui.h:49 +#: ../data/gui/accounts_window.ui.h:50 msgid "Connection" msgstr "Verbindung" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840 -#: ../src/config.py:2436 +#: ../data/gui/accounts_window.ui.h:51 ../src/config.py:1846 +#: ../src/config.py:2454 msgid "No key selected" msgstr "Kein Schlüssel ausgewählt" -#: ../data/gui/accounts_window.ui.h:51 +#: ../data/gui/accounts_window.ui.h:52 msgid "Choose _Key..." msgstr "_Schlüssel wählen …" -#: ../data/gui/accounts_window.ui.h:52 +#: ../data/gui/accounts_window.ui.h:53 msgid "Use G_PG Agent" msgstr "G_PG Schlüsselverwaltung verwenden" # TODO: GPG/PGP unification in original strings needed -#: ../data/gui/accounts_window.ui.h:53 +#: ../data/gui/accounts_window.ui.h:54 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" msgstr "" "Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie " "seahorse." -#: ../data/gui/accounts_window.ui.h:54 +#: ../data/gui/accounts_window.ui.h:55 msgid "OpenPGP" msgstr "OpenPGP" -#: ../data/gui/accounts_window.ui.h:55 +#: ../data/gui/accounts_window.ui.h:56 msgid "_Edit Personal Information..." msgstr "Persönliche Informationen b_earbeiten …" -#: ../data/gui/accounts_window.ui.h:56 +#: ../data/gui/accounts_window.ui.h:57 msgid "Information about you, as stored in the server" msgstr "Informationen über Sie, die auf dem Server gespeichert sind" -#: ../data/gui/accounts_window.ui.h:57 +#: ../data/gui/accounts_window.ui.h:58 msgid "Personal Information" msgstr "Persönliche Informationen" -#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1 +#: ../data/gui/accounts_window.ui.h:59 ../data/gui/profile_window.ui.h:1 msgid "Personal Information" msgstr "Persönliche Informationen" -#: ../data/gui/accounts_window.ui.h:59 +#: ../data/gui/accounts_window.ui.h:60 msgid "Co_nnect on Gajim startup" msgstr "Beim _Programmstart verbinden" -#: ../data/gui/accounts_window.ui.h:60 +#: ../data/gui/accounts_window.ui.h:61 msgid "Synchroni_ze account status with global status" msgstr "Konto-Status mit globalem Status synchroni_sieren" -#: ../data/gui/accounts_window.ui.h:61 +#: ../data/gui/accounts_window.ui.h:62 msgid "Use cust_om port:" msgstr "Benutzerdefinierten P_ort verwenden:" -#: ../data/gui/accounts_window.ui.h:62 +#: ../data/gui/accounts_window.ui.h:63 msgid "" "If the default port that is used for incoming messages is unfitting for your " "setup you can select another one here.\n" @@ -488,28 +497,28 @@ "festlegen.\n" "Eventuell müssen Sie dazu Ihre Firewall-Einstellungen ändern." -#: ../data/gui/accounts_window.ui.h:64 +#: ../data/gui/accounts_window.ui.h:65 #: ../data/gui/zeroconf_information_window.ui.h:10 msgid "First Name:" msgstr "Vorname:" -#: ../data/gui/accounts_window.ui.h:65 +#: ../data/gui/accounts_window.ui.h:66 #: ../data/gui/zeroconf_information_window.ui.h:9 msgid "Last Name:" msgstr "Nachname:" -#: ../data/gui/accounts_window.ui.h:66 +#: ../data/gui/accounts_window.ui.h:67

1 0

gajim: [misterX] update MAM implementation to V0.3
by Gajim 27 Dec '14

27 Dec '14

changeset b935d0950064 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=b935d0950064 description: [misterX] update MAM implementation to V0.3 diffstat: src/common/config.py | 2 +- src/common/defs.py | 2 +- src/common/message_archiving.py | 53 +++++++++++++++++++++++----------------- src/common/optparser.py | 10 +++++++ src/gajim.py | 2 +- src/gui_interface.py | 2 +- 6 files changed, 44 insertions(+), 27 deletions(-) diffs (172 lines): diff -r c040f230584f -r b935d0950064 src/common/config.py --- a/src/common/config.py Wed Nov 26 21:41:09 2014 +0100 +++ b/src/common/config.py Sat Dec 27 16:44:05 2014 +0100 @@ -316,7 +316,6 @@ 'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')], 'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], 'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')], - 'last_mam_id': [opt_str, '', _('Last MAM id we are syncronized with')], }, {}) __options_per_key = { @@ -417,6 +416,7 @@ 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which we want to re-open a chat window on next startup.')], + 'last_mam_id': [opt_str, '', _('Last MAM id we are syncronized with')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], diff -r c040f230584f -r b935d0950064 src/common/defs.py --- a/src/common/defs.py Wed Nov 26 21:41:09 2014 +0100 +++ b/src/common/defs.py Sat Dec 27 16:44:05 2014 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16' +version = '0.16.0.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, diff -r c040f230584f -r b935d0950064 src/common/message_archiving.py --- a/src/common/message_archiving.py Wed Nov 26 21:41:09 2014 +0100 +++ b/src/common/message_archiving.py Sat Dec 27 16:44:05 2014 +0100 @@ -41,16 +41,16 @@ ConnectionArchive.__init__(self) self.archiving_313_supported = False self.mam_awaiting_disco_result = {} - gajim.ged.register_event_handler('raw-iq-received', ged.CORE, - self._nec_raw_iq_313_received) + gajim.ged.register_event_handler('raw-message-received', ged.CORE, + self._nec_raw_message_313_received) gajim.ged.register_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error) gajim.ged.register_event_handler('agent-info-received', ged.CORE, self._nec_agent_info) def cleanup(self): - gajim.ged.remove_event_handler('raw-iq-received', ged.CORE, - self._nec_raw_iq_313_received) + gajim.ged.remove_event_handler('raw-message-received', ged.CORE, + self._nec_raw_message_313_received) def _nec_agent_info_error(self, obj): if obj.jid in self.mam_awaiting_disco_result: @@ -77,42 +77,49 @@ msg=msg_txt) del self.mam_awaiting_disco_result[obj.jid] - def _nec_raw_iq_313_received(self, obj): + def _nec_raw_message_313_received(self, obj): if obj.conn.name != self.name: return - id_ = obj.stanza.getID() - if id_ not in self.awaiting_answers: + fin_ = obj.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) + if fin_: + queryid_ = fin_.getAttr('queryid') + if queryid_ not in self.awaiting_answers: + return + else: return - if self.awaiting_answers[id_][0] == MAM_RESULTS_ARRIVED: - query = obj.stanza.getTag('query', namespace=nbxmpp.NS_MAM) - if query: - set_ = query.getTag('set', namespace=nbxmpp.NS_RSM) - if set_: - last = set_.getTagData('last') - if last: - gajim.config.set('last_mam_id', last) - self.request_archive(after=last) - del self.awaiting_answers[id_] + if self.awaiting_answers[queryid_][0] == MAM_RESULTS_ARRIVED: + set_ = fin_.getTag('set', namespace=nbxmpp.NS_RSM) + if set_: + last = set_.getTagData('last') + if last: + gajim.config.set_per('accounts', self.name, 'last_mam_id', last) + self.request_archive(after=last) + + del self.awaiting_answers[queryid_] def request_archive(self, start=None, end=None, with_=None, after=None, max=30): - iq_ = nbxmpp.Iq('get') - query = iq_.setTag('query', namespace=nbxmpp.NS_MAM) + iq_ = nbxmpp.Iq('set') + query = iq_.addChild('query', namespace=nbxmpp.NS_MAM) + x = query.addChild('x', namespace=nbxmpp.NS_DATA) + x.addChild(node=nbxmpp.DataField(typ='hidden', name='FORM_TYPE', value=nbxmpp.NS_MAM)) if start: - query.addChild('start', payload=start) + x.addChild(node=nbxmpp.DataField(typ='text-single', name='start', value=start)) if end: - query.addChild('end', payload=end) + x.addChild(node=nbxmpp.DataField(typ='text-single', name='end', value=end)) if with_: - query.addChild('with', payload=with_) + x.addChild(node=nbxmpp.DataField(typ='jid-single', name='with', value=with_)) set_ = query.setTag('set', namespace=nbxmpp.NS_RSM) set_.setTagData('max', max) if after: set_.setTagData('after', after) + queryid_ = self.connection.getAnID() + query.setAttr('queryid', queryid_) id_ = self.connection.getAnID() iq_.setID(id_) - self.awaiting_answers[id_] = (MAM_RESULTS_ARRIVED, ) + self.awaiting_answers[queryid_] = (MAM_RESULTS_ARRIVED, ) self.connection.send(iq_) diff -r c040f230584f -r b935d0950064 src/common/optparser.py --- a/src/common/optparser.py Wed Nov 26 21:41:09 2014 +0100 +++ b/src/common/optparser.py Sat Dec 27 16:44:05 2014 +0100 @@ -225,6 +225,8 @@ self.update_config_to_01401() if old < [0, 14, 90, 0] and new >= [0, 14, 90, 0]: self.update_config_to_014900() + if old < [0, 16, 0, 1] and new >= [0, 16, 0, 1]: + self.update_config_to_01601() gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -912,3 +914,11 @@ gajim.config.set('use_stun_server', False) if os.name == 'nt': gajim.config.set('autodetect_browser_mailer', True) + + def update_config_to_01601(self): + if 'last_mam_id' in self.old_values: + last_mam_id = self.old_values['last_mam_id'] + for account in gajim.config.get_per('accounts'): + gajim.config.set_per('accounts', account, 'last_mam_id', + last_mam_id) + gajim.config.set('version', '0.16.0.1') diff -r c040f230584f -r b935d0950064 src/gajim.py --- a/src/gajim.py Wed Nov 26 21:41:09 2014 +0100 +++ b/src/gajim.py Sat Dec 27 16:44:05 2014 +0100 @@ -69,7 +69,7 @@ pass HAS_NBXMPP=True -MIN_NBXMPP_VER = "0.5.1" +MIN_NBXMPP_VER = "0.5.2" try: import nbxmpp except ImportError: diff -r c040f230584f -r b935d0950064 src/gui_interface.py --- a/src/gui_interface.py Wed Nov 26 21:41:09 2014 +0100 +++ b/src/gui_interface.py Sat Dec 27 16:44:05 2014 +0100 @@ -1140,7 +1140,7 @@ gajim.config.set_per('accounts', account, 'last_archiving_time', time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())) if obj.conn.archiving_313_supported: - mam_id = gajim.config.get('last_mam_id') + mam_id = gajim.config.get_per('accounts', account, 'last_mam_id') if mam_id: obj.conn.request_archive(after=mam_id) else:

1 0

python-nbxmpp: prepare 0.5.2 release
by Python-nbxmpp 27 Dec '14

27 Dec '14

changeset 3026969b524f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3026969b524f description: prepare 0.5.2 release diffstat: ChangeLog | 6 ++++++ nbxmpp/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diffs (34 lines): diff -r a34dc64fb1ee -r 3026969b524f ChangeLog --- a/ChangeLog Sat Dec 27 16:14:12 2014 +0100 +++ b/ChangeLog Sat Dec 27 16:14:35 2014 +0100 @@ -1,3 +1,9 @@ +python-nbxmpp 0.5.2 (27 December 2014) + + * Fix BOSH HTTP requests + * Fix handling of binary SASL data for mechanism GSSAPI + * Update MAM namespace + python-nbxmpp 0.5.1 (04 October 2014) * Fix printing network errors in a non-utf-8 console diff -r a34dc64fb1ee -r 3026969b524f nbxmpp/__init__.py --- a/nbxmpp/__init__.py Sat Dec 27 16:14:12 2014 +0100 +++ b/nbxmpp/__init__.py Sat Dec 27 16:14:35 2014 +0100 @@ -17,4 +17,4 @@ from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.5.1" +__version__ = "0.5.2" diff -r a34dc64fb1ee -r 3026969b524f setup.py --- a/setup.py Sat Dec 27 16:14:12 2014 +0100 +++ b/setup.py Sat Dec 27 16:14:35 2014 +0100 @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.5.1', + version='0.5.2', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org',

1 0

python-nbxmpp: Added tag nbxmpp-0.5.2 for changeset 3026969b524f
by Python-nbxmpp 27 Dec '14

27 Dec '14

changeset 75ec05666681 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=75ec05666681 description: Added tag nbxmpp-0.5.2 for changeset 3026969b524f diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 3026969b524f -r 75ec05666681 .hgtags --- a/.hgtags Sat Dec 27 16:14:35 2014 +0100 +++ b/.hgtags Sat Dec 27 16:15:51 2014 +0100 @@ -4,3 +4,4 @@ 46e9c8c80bacac8260245d5d9752ba0c5bddcf89 nbxmpp-0.4 70c9ac0c2b9bd3786df85d921c7f0a54fa6c92b4 nbxmpp-0.5 3576e23060992c7157b070faae0cb69dbb981079 nbxmpp-0.5.1 +3026969b524fb04723eb973e4a951adb2140d6a9 nbxmpp-0.5.2

1 0

python-nbxmpp: fix tests with missing parmeter
by Python-nbxmpp 27 Dec '14

27 Dec '14

changeset 28009c6fe33f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=28009c6fe33f description: fix tests with missing parmeter diffstat: test/unit/test_xmpp_transports_nb2.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 830872341298 -r 28009c6fe33f test/unit/test_xmpp_transports_nb2.py --- a/test/unit/test_xmpp_transports_nb2.py Mon Dec 22 22:00:08 2014 +0100 +++ b/test/unit/test_xmpp_transports_nb2.py Sat Dec 27 16:13:32 2014 +0100 @@ -82,6 +82,7 @@ idlequeue=self.idlequeue, estabilish_tls=establish_tls, certs=('../data/other/cacerts.pem', 'tmp/cacerts.pem'), + tls_version=None, cipher_list=None, proxy_dict=proxy_dict) @@ -216,6 +217,7 @@ idlequeue=self.idlequeue_thread.iq, estabilish_tls=False, certs=None, + tls_version=None, cipher_list=None, on_http_request_possible=lambda: None, on_persistent_fallback=None,

1 0

python-nbxmpp: update MAM namespace
by Python-nbxmpp 27 Dec '14

27 Dec '14

changeset a34dc64fb1ee in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=a34dc64fb1ee description: update MAM namespace diffstat: nbxmpp/protocol.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 28009c6fe33f -r a34dc64fb1ee nbxmpp/protocol.py --- a/nbxmpp/protocol.py Sat Dec 27 16:13:32 2014 +0100 +++ b/nbxmpp/protocol.py Sat Dec 27 16:14:12 2014 +0100 @@ -100,7 +100,7 @@ NS_JINGLE_IBB = 'urn:xmpp:jingle:transports:ibb:1' # XEP-0261 NS_LAST = 'jabber:iq:last' NS_LOCATION = 'http://jabber.org/protocol/geoloc' # XEP-0080 -NS_MAM = 'urn:xmpp:mam:tmp' # XEP-0313 +NS_MAM = 'urn:xmpp:mam:0' # XEP-0313 NS_MESSAGE = 'message' # Jabberd2 NS_MOOD = 'http://jabber.org/protocol/mood' # XEP-0107 NS_MUC = 'http://jabber.org/protocol/muc'

1 0

python-nbxmpp: [thpo] fix handling of binary SASL data for mecha...
by Python-nbxmpp 22 Dec '14

22 Dec '14

changeset 830872341298 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=830872341298 description: [thpo] fix handling of binary SASL data for mechanism GSSAPI. Fixes #30 diffstat: nbxmpp/auth_nb.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (28 lines): diff -r 7c7c2ca7effb -r 830872341298 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Sat Nov 08 22:21:36 2014 +0100 +++ b/nbxmpp/auth_nb.py Mon Dec 22 22:00:08 2014 +0100 @@ -301,7 +301,11 @@ split('\n')) incoming_data = challenge.getData() - data=base64.b64decode(incoming_data.encode('utf-8')).decode('utf-8') + data=base64.b64decode(incoming_data.encode('utf-8')) + + if self.mechanism != 'GSSAPI': + data=data.decode('utf-8') + ### Handle Auth result def on_auth_fail(reason): log.info('Failed SASL authentification: %s' % reason) @@ -352,7 +356,10 @@ raise NodeProcessed ### Perform auth step - log.info('Got challenge:' + data) + if self.mechanism != 'GSSAPI': + log.info('Got challenge:' + data) + else: + log.info('Got challenge') if self.mechanism == 'GSSAPI': if self.gss_step == GSS_STATE_STEP:

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