Commits

commits@gajim.org

17632 discussions

gajim: [SamWhited] fix Gtk.MenuItem.new_with_label call. Fixes #...
by Gajim 05 Jan '15

05 Jan '15

changeset a067244c9ff8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a067244c9ff8 description: [SamWhited] fix Gtk.MenuItem.new_with_label call. Fixes #7916 diffstat: src/groupchat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 0b6012f288fe -r a067244c9ff8 src/groupchat_control.py --- a/src/groupchat_control.py Mon Jan 05 21:45:42 2015 +0100 +++ b/src/groupchat_control.py Mon Jan 05 22:34:37 2015 +0100 @@ -593,7 +593,8 @@ for nick in sorted(gajim.contacts.get_nick_list(self.account, self.room_jid)): - item = Gtk.MenuItem.new_with_label(nick, use_underline=False) + item = Gtk.MenuItem.new_with_label(nick) + item.set_use_underline(False) submenu.append(item) id_ = item.connect('activate', self.append_nick_in_msg_textview, nick)

1 0

gajim: fix OpenSSL usage for py3. Fixes #7915
by Gajim 05 Jan '15

05 Jan '15

changeset 0b6012f288fe in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0b6012f288fe description: fix OpenSSL usage for py3. Fixes #7915 diffstat: src/gajim.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 96ab9c5e925b -r 0b6012f288fe src/gajim.py --- a/src/gajim.py Fri Jan 02 21:53:59 2015 +0100 +++ b/src/gajim.py Mon Jan 05 21:45:42 2015 +0100 @@ -339,7 +339,10 @@ except TypeError: OpenSSL.rand.load_file(RNG_SEED.encode('utf-8')) crypto.add_entropy_sources_OpenSSL() - OpenSSL.rand.write_file(str(RNG_SEED)) + try: + OpenSSL.rand.write_file(RNG_SEED) + except TypeError: + OpenSSL.rand.write_file(RNG_SEED.encode('utf-8')) except ImportError: log.info("PyOpenSSL PRNG not available")

1 0

gajim: improve ipv6 connection with zeroconf
by Gajim 03 Jan '15

03 Jan '15

changeset 81a8581bfed4 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=81a8581bfed4 description: improve ipv6 connection with zeroconf diffstat: src/common/zeroconf/client_zeroconf.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7208aa30689f -r 81a8581bfed4 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sat Jan 03 15:24:58 2015 +0100 +++ b/src/common/zeroconf/client_zeroconf.py Sat Jan 03 20:51:41 2015 +0100 @@ -453,7 +453,7 @@ def do_connect(self): errnum = 0 try: - self._sock.connect(self._server) + self._sock.connect(self._server[:2]) self._sock.setblocking(False) except Exception, ee: (errnum, errstr) = ee

1 0

gajim: don't show useless buttons in notifications. Fixes #7838
by Gajim 03 Jan '15

03 Jan '15

changeset 7208aa30689f 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=7208aa30689f description: don't show useless buttons in notifications. Fixes #7838 diffstat: src/gui_interface.py | 4 ++-- src/notify.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diffs (42 lines): diff -r 50aa83946a3e -r 7208aa30689f src/gui_interface.py --- a/src/gui_interface.py Sat Jan 03 14:15:18 2015 +0100 +++ b/src/gui_interface.py Sat Jan 03 15:24:58 2015 +0100 @@ -201,7 +201,7 @@ path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48) account = obj.conn.name notify.popup(_('Connection Failed'), account, account, - 'connection_failed', path, obj.title, obj.msg) + '', path, obj.title, obj.msg) def unblock_signed_in_notifications(self, account): gajim.block_signed_in_notifications[account] = False @@ -664,7 +664,7 @@ else: path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48) account = obj.conn.name - notify.popup('warning', account, account, 'warning', path, + notify.popup('warning', account, account, '', path, _('OpenPGP Passphrase Incorrect'), _('You are currently connected without your OpenPGP key.')) self.forget_gpg_passphrase(obj.keyID) diff -r 50aa83946a3e -r 7208aa30689f src/notify.py --- a/src/notify.py Sat Jan 03 14:15:18 2015 +0100 +++ b/src/notify.py Sat Jan 03 15:24:58 2015 +0100 @@ -332,7 +332,7 @@ version = self.version if version[:2] == [0, 2]: actions = {} - if 'actions' in self.capabilities: + if 'actions' in self.capabilities and self.msg_type: actions = {'default': 0} try: self.notif.Notify( @@ -381,7 +381,7 @@ self.path_to_image = os.path.abspath( gtkgui_helpers.get_icon_path('gajim', 48)) actions = () - if 'actions' in self.capabilities: + if 'actions' in self.capabilities and self.msg_type: actions = (dbus.String('default'), dbus.String( self.event_type)) try:

1 0

gajim: correctly cleanup handlers when disabling an account. Fix...
by Gajim 03 Jan '15

03 Jan '15

changeset 50aa83946a3e 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=50aa83946a3e description: correctly cleanup handlers when disabling an account. Fixes #7711 diffstat: src/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r ef153a5700d3 -r 50aa83946a3e src/config.py --- a/src/config.py Fri Jan 02 13:36:29 2015 +0100 +++ b/src/config.py Sat Jan 03 14:15:18 2015 +0100 @@ -2530,6 +2530,7 @@ gajim.interface.roster.close_all(account) if account == gajim.ZEROCONF_ACC_NAME: gajim.connections[account].disable_account() + gajim.connections[account].cleanup() del gajim.connections[account] del gajim.interface.instances[account] del gajim.interface.minimized_controls[account]

1 0

gajim: fix using change status dialog
by Gajim 02 Jan '15

02 Jan '15

changeset 96ab9c5e925b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=96ab9c5e925b description: fix using change status dialog diffstat: data/gui/change_status_message_dialog.ui | 12 ++++++------ src/common/resolver.py | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diffs (75 lines): diff -r b1aa3a4d5b29 -r 96ab9c5e925b data/gui/change_status_message_dialog.ui --- a/data/gui/change_status_message_dialog.ui Fri Jan 02 13:36:29 2015 +0100 +++ b/data/gui/change_status_message_dialog.ui Fri Jan 02 21:53:59 2015 +0100 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> + <interface> -  + <requires lib="gtk+" version="3.10"/> <object class="GtkDialog" id="change_status_message_dialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -27,7 +28,6 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -45,7 +45,6 @@ <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -112,7 +111,6 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <signal name="clicked" handler="on_save_as_preset_button_clicked" swapped="no"/> <child> <object class="GtkAlignment" id="alignment106"> @@ -182,7 +180,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <signal name="clicked" handler="on_mood_button_clicked" swapped="no"/> <child> <object class="GtkHBox" id="hbox2"> @@ -231,7 +228,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <signal name="clicked" handler="on_activity_button_clicked" swapped="no"/> <child> <object class="GtkHBox" id="hbox1"> @@ -354,5 +350,9 @@ </child> </object> </child> + <action-widgets> + <action-widget response="-6">cancel_button</action-widget> + <action-widget response="-5">ok_button</action-widget> + </action-widgets> </object> </interface> diff -r b1aa3a4d5b29 -r 96ab9c5e925b src/common/resolver.py --- a/src/common/resolver.py Fri Jan 02 13:36:29 2015 +0100 +++ b/src/common/resolver.py Fri Jan 02 21:53:59 2015 +0100 @@ -326,8 +326,7 @@ domain = None if line.startswith(fqdn): domain = fqdn # For nslookup 9.5 - elif helpers.decode_string(line).startswith(ufqdn): - line = helpers.decode_string(line) + elif line.startswith(ufqdn): domain = ufqdn # For nslookup 9.6 if domain: # add 4 for ' has' after domain name

1 0

gajim: fix account creation
by Gajim 02 Jan '15

02 Jan '15

changeset 1bd0a83809ff in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1bd0a83809ff description: fix account creation diffstat: data/gui/account_creation_wizard_window.ui | 81 +++++++++++++++++++++-------- src/config.py | 25 +++++---- 2 files changed, 72 insertions(+), 34 deletions(-) diffs (239 lines): diff -r aa62e34444e9 -r 1bd0a83809ff data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Mon Dec 29 19:13:12 2014 +0100 +++ b/data/gui/account_creation_wizard_window.ui Fri Jan 02 13:37:47 2015 +0100 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> + <interface> -  + <requires lib="gtk+" version="3.10"/> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -22,6 +23,20 @@ </row> </data> </object> + <object class="GtkListStore" id="server_liststore"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkEntryCompletion" id="server_entrycompletion"> + <property name="model">server_liststore</property> + <property name="text_column">0</property> + </object> + <object class="GtkEntryCompletion" id="server_entrycompletion1"> + <property name="model">server_liststore</property> + <property name="text_column">0</property> + </object> <object class="GtkWindow" id="account_creation_wizard_window"> <property name="can_focus">False</property> <property name="border_width">12</property> @@ -30,15 +45,15 @@ <property name="type_hint">dialog</property> <signal name="destroy" handler="on_wizard_window_destroy" swapped="no"/> <child> - <object class="GtkVBox" id="vbox77"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="show_tabs">False</property> <property name="show_border">False</property> <child> <object class="GtkVBox" id="vbox78"> @@ -85,6 +100,7 @@ <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> + <property name="active">True</property> <property name="draw_indicator">True</property> </object> <packing> @@ -208,7 +224,7 @@ <property name="tooltip_text" translatable="yes">If checked, Gajim will remember the password for this account</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_save_password_checkbutton_toggled" swapped="no"/> @@ -283,7 +299,21 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkComboBoxText" id="server_comboboxtext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="server_comboboxtext_entry"> + <property name="can_focus">True</property> + <property name="completion">server_entrycompletion</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + </packing> </child> </object> <packing> @@ -328,7 +358,7 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox2997"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -346,10 +376,28 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkComboBoxText" id="server_comboboxtext1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="server_comboboxtext_entry1"> + <property name="can_focus">True</property> + <property name="completion">server_entrycompletion1</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -563,7 +611,7 @@ <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-dialog-warning</property> - <property name="icon-size">5</property> + <property name="icon_size">5</property> </object> <packing> <property name="expand">False</property> @@ -720,6 +768,7 @@ <property name="xalign">0.10000000149011612</property> <property name="use_markup">True</property> <property name="wrap">True</property> + <property name="max_width_chars">100</property> </object> <packing> <property name="expand">True</property> @@ -791,7 +840,7 @@ </packing> </child> <child> - <object class="GtkHButtonBox" id="hbuttonbox19"> + <object class="GtkButtonBox" id="buttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">12</property> @@ -890,18 +939,4 @@ </object> </child> </object> - <object class="GtkListStore" id="server_liststore"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkEntryCompletion" id="server_entrycompletion"> - <property name="model">server_liststore</property> - <property name="text_column">0</property> - </object> - <object class="GtkEntryCompletion" id="server_entrycompletion1"> - <property name="model">server_liststore</property> - <property name="text_column">0</property> - </object> </interface> diff -r aa62e34444e9 -r 1bd0a83809ff src/config.py --- a/src/config.py Mon Dec 29 19:13:12 2014 +0100 +++ b/src/config.py Fri Jan 02 13:37:47 2015 +0100 @@ -3532,13 +3532,13 @@ self.window = self.xml.get_object('account_creation_wizard_window') self.window.set_transient_for(gajim.interface.roster.window) - # Connect events from comboboxentry.get_child() - server_comboboxentry = self.xml.get_object('server_comboboxentry') - entry = server_comboboxentry.get_child() + # Connect events from comboboxtext_entry + server_comboboxtext = self.xml.get_object('server_comboboxtext') + entry = self.xml.get_object('server_comboboxtext_entry') entry.connect('key_press_event', - self.on_server_comboboxentry_key_press_event, server_comboboxentry) - # Do the same for the other server comboboxentry - server_comboboxentry1 = self.xml.get_object('server_comboboxentry1') + self.on_server_comboboxentry_key_press_event, server_comboboxtext) + + server_comboboxtext1 = self.xml.get_object('server_comboboxtext1') self.update_proxy_list() @@ -3549,6 +3549,9 @@ for server in servers: servers_model.append((server,)) + server_comboboxtext.set_model(servers_model) + server_comboboxtext1.set_model(servers_model) + # Generic widgets self.notebook = self.xml.get_object('notebook') self.cancel_button = self.xml.get_object('cancel_button') @@ -3689,7 +3692,7 @@ 'You must provide a username to configure this account.') dialogs.ErrorDialog(pritext, sectext) return - server = self.xml.get_object('server_comboboxentry').get_child().\ + server = self.xml.get_object('server_comboboxtext_entry').\ get_text().strip() savepass = self.xml.get_object('save_password_checkbutton').\ get_active() @@ -3722,7 +3725,7 @@ self.show_finish_page() elif cur_page == 2: # We are creating a new account - server = self.xml.get_object('server_comboboxentry1').get_child().\ + server = self.xml.get_object('server_comboboxtext_entry1').\ get_text() if not server: @@ -3977,9 +3980,9 @@ def on_username_entry_key_press_event(self, widget, event): # Check for pressed @ and jump to combobox if found if event.keyval == Gdk.KEY_at: - combobox = self.xml.get_object('server_comboboxentry') - combobox.grab_focus() - combobox.get_child().set_position(-1) + entry = self.xml.get_object('server_comboboxtext_entry') + entry.grab_focus() + entry.set_position(-1) return True def on_server_comboboxentry_key_press_event(self, widget, event, combobox):

1 0

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

02 Jan '15

changeset b1aa3a4d5b29 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b1aa3a4d5b29 description: sort accounts in accounts window diffstat: src/config.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 1bd0a83809ff -r b1aa3a4d5b29 src/config.py --- a/src/config.py Fri Jan 02 13:37:47 2015 +0100 +++ b/src/config.py Fri Jan 02 13:36:29 2015 +0100 @@ -1632,7 +1632,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: Zeroconf doesn't support archiving
by Gajim 02 Jan '15

02 Jan '15

changeset 779bad37cde6 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=779bad37cde6 description: Zeroconf doesn't support archiving diffstat: src/common/connection.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r e7d472055988 -r 779bad37cde6 src/common/connection.py --- a/src/common/connection.py Tue Nov 11 16:11:26 2014 +0100 +++ b/src/common/connection.py Wed Nov 26 21:41:09 2014 +0100 @@ -160,6 +160,8 @@ self.vcard_supported = False self.private_storage_supported = False self.archiving_supported = False + self.archiving_313_supported = False + self.archiving_136_supported = False self.archive_pref_supported = False self.roster_supported = True self.blocking_supported = False

1 0

gajim: [misterX] update MAM implementation to V0.3
by Gajim 02 Jan '15

02 Jan '15

changeset 942be189562d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=942be189562d 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 779bad37cde6 -r 942be189562d 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 = { @@ -418,6 +417,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 779bad37cde6 -r 942be189562d 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 779bad37cde6 -r 942be189562d 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 779bad37cde6 -r 942be189562d 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 @@ -215,6 +215,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() @@ -902,3 +904,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 779bad37cde6 -r 942be189562d 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 779bad37cde6 -r 942be189562d 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 @@ -1141,7 +1141,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

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