Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 17 commits: Autogenerate a pylint configuration file.
by Philipp Hörist 11 Feb '17

11 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8c928c2 by Emmanuel Gil Peyrot at 2017-02-07T21:00:31+00:00 Autogenerate a pylint configuration file. - - - - - e2901f09 by Emmanuel Gil Peyrot at 2017-02-07T21:00:43+00:00 pylint: Tweak the configuration file a bit. - - - - - 51eb62bb by Emmanuel Gil Peyrot at 2017-02-07T21:00:52+00:00 Replace some wildcard imports with explicit ones. - - - - - 07716dae by Emmanuel Gil Peyrot at 2017-02-08T02:26:20+00:00 Use staticmethod decorator where it makes sense. - - - - - 289d82fa by Emmanuel Gil Peyrot at 2017-02-08T02:26:20+00:00 Remove unused imports. - - - - - 5f91455f by Emmanuel Gil Peyrot at 2017-02-08T02:26:20+00:00 common.dh: Reformat to follow PEP-0008. - - - - - fb221a69 by Emmanuel Gil Peyrot at 2017-02-08T02:26:21+00:00 Remove wrong usage of the list(range(…)) pattern. - - - - - b6b1a7a0 by Emmanuel Gil Peyrot at 2017-02-08T02:26:21+00:00 ACE: Remove unused constants. - - - - - 2fbadc91 by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Use Enum or IntEnum instead of range() constants. - - - - - a7349dc6 by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 common.connection: Fix indentation. - - - - - 381a8f2b by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Remove unnecessary semicolons. - - - - - 1f9ac730 by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Replace long() in remaining python2 code with int(). - - - - - 57fb80f1 by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Remove every default argument using [] or {}. - - - - - ad9370af by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Fix a bunch of issues in common.jingle*. - - - - - eb51184a by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Fix a few things in common.connection_handlers_events. - - - - - a4387e84 by Emmanuel Gil Peyrot at 2017-02-11T02:40:10+00:00 Use “… is not …” everywhere instead of “not … is …”. - - - - - 26aa0382 by Philipp Hörist at 2017-02-11T17:54:19+01:00 Merge branch 'pylint' into 'master' Add a pylint configuration file and fix a few of the issues found See merge request !54 - - - - - 26 changed files: - + pylintrc - src/advanced_configuration_window.py - src/atom_window.py - src/chat_control.py - src/chat_control_base.py - src/command_system/framework.py - src/command_system/implementation/custom.py - src/command_system/implementation/execute.py - src/command_system/implementation/standard.py - src/command_system/tools.py - src/common/caps_cache.py - src/common/config.py - src/common/configpaths.py - src/common/connection.py - src/common/connection_handlers.py - src/common/connection_handlers_events.py - src/common/contacts.py - src/common/dh.py - src/common/events.py - src/common/gajim.py - src/common/helpers.py - src/common/jingle.py - src/common/jingle_content.py - src/common/jingle_ft.py - src/common/jingle_ftstates.py - src/common/jingle_rtp.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d6ceca834420345f14c09cba9250aa3a3…

1 0

[Git][gajim/gajim][master] 8 commits: Close Feature Window with ESC
by Philipp Hörist 09 Feb '17

09 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 05566a63 by Philipp Hörist at 2017-02-06T22:28:07+01:00 Close Feature Window with ESC - - - - - 91bb0183 by Philipp Hörist at 2017-02-06T23:05:49+01:00 Close Bookmark Window with ESC - - - - - 9b0d7222 by Philipp Hörist at 2017-02-06T23:05:57+01:00 Close Service Discovery Window with ESC - - - - - 5dff9bb0 by Philipp Hörist at 2017-02-06T23:10:09+01:00 Close Archiving Preferences Window with ESC - - - - - ad936b8d by Philipp Hörist at 2017-02-06T23:12:31+01:00 Close XML Console Window with ESC - - - - - fa542371 by Philipp Hörist at 2017-02-06T23:19:07+01:00 Close Privacy Lists Window with ESC - - - - - 1ad087e5 by Philipp Hörist at 2017-02-06T23:21:04+01:00 Close Plugins Window with ESC - - - - - d6ceca83 by Philipp Hörist at 2017-02-09T20:19:20+01:00 Merge branch 'keypress' into 'master' Close Windows with ESC Key See merge request !53 - - - - - 13 changed files: - data/gui/archiving_313_preferences_window.ui - data/gui/features_window.ui - data/gui/manage_bookmarks_window.ui - data/gui/plugins_window.ui - data/gui/privacy_list_window.ui - data/gui/privacy_lists_window.ui - data/gui/service_discovery_window.ui - data/gui/xml_console_window.ui - src/config.py - src/dialogs.py - src/disco.py - src/features_window.py - src/plugins/gui.py Changes: ===================================== data/gui/archiving_313_preferences_window.ui ===================================== --- a/data/gui/archiving_313_preferences_window.ui +++ b/data/gui/archiving_313_preferences_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="add_image"> @@ -43,6 +43,7 @@ <property name="window_position">center</property> <property name="default_width">450</property> <signal name="destroy" handler="on_archiving_preferences_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkGrid" id="pref_grid"> <property name="visible">True</property> ===================================== data/gui/features_window.ui ===================================== --- a/data/gui/features_window.ui +++ b/data/gui/features_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkWindow" id="features_window"> @@ -10,6 +10,7 @@ <property name="default_width">300</property> <property name="default_height">530</property> <property name="type_hint">dialog</property> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> @@ -22,9 +23,9 @@ <property name="visible">True</property> <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="xalign">0</property> <property name="label" translatable="yes"><b>List of possible features in Gajim:</b></property> <property name="use_markup">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -98,9 +99,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">12</property> - <property name="xalign">0</property> <property name="wrap">True</property> <property name="selectable">True</property> + <property name="xalign">0</property> </object> </child> <child type="label"> ===================================== data/gui/manage_bookmarks_window.ui ===================================== --- a/data/gui/manage_bookmarks_window.ui +++ b/data/gui/manage_bookmarks_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkListStore" id="liststore1"> @@ -15,6 +15,7 @@ <property name="default_width">550</property> <property name="default_height">300</property> <property name="type_hint">dialog</property> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox86"> <property name="visible">True</property> @@ -116,9 +117,9 @@ <object class="GtkLabel" id="label325"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Title:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -129,9 +130,9 @@ <object class="GtkLabel" id="label315"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Nickname:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -142,9 +143,9 @@ <object class="GtkLabel" id="label316"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Roo_m:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -155,9 +156,9 @@ <object class="GtkLabel" id="label317"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Server:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -168,9 +169,9 @@ <object class="GtkLabel" id="label318"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -231,9 +232,9 @@ <object class="GtkLabel" id="label326"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Pr_int status:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> ===================================== data/gui/plugins_window.ui ===================================== --- a/data/gui/plugins_window.ui +++ b/data/gui/plugins_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="image1"> @@ -27,6 +27,7 @@ <property name="default_height">500</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_plugins_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> @@ -218,9 +219,9 @@ <object class="GtkLinkButton" id="plugin_homepage_linkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <property name="xalign">0</property> </object> <packing> ===================================== data/gui/privacy_list_window.ui ===================================== --- a/data/gui/privacy_list_window.ui +++ b/data/gui/privacy_list_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAdjustment" id="adjustment1"> @@ -47,6 +47,7 @@ <property name="title" translatable="yes">Privacy List</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_privacy_list_edit_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="main_vbox"> <property name="visible">True</property> ===================================== data/gui/privacy_lists_window.ui ===================================== --- a/data/gui/privacy_lists_window.ui +++ b/data/gui/privacy_lists_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkListStore" id="liststore1"> @@ -15,6 +15,7 @@ <property name="title" translatable="yes">window1</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_privacy_lists_first_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> @@ -30,8 +31,8 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Privacy Lists:</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> ===================================== data/gui/service_discovery_window.ui ===================================== --- a/data/gui/service_discovery_window.ui +++ b/data/gui/service_discovery_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="image1"> @@ -15,6 +15,7 @@ <property name="default_height">420</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_service_discovery_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox11"> <property name="visible">True</property> @@ -34,11 +35,11 @@ <object class="GtkLabel" id="banner_agent_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0.05000000074505806</property> <property name="ypad">6</property> <property name="label"><span weight="heavy" size="large">Agent name</span> Agent JID - node</property> <property name="use_markup">True</property> + <property name="xalign">0.05000000074505806</property> </object> <packing> <property name="expand">True</property> ===================================== data/gui/xml_console_window.ui ===================================== --- a/data/gui/xml_console_window.ui +++ b/data/gui/xml_console_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="image1"> @@ -13,6 +13,7 @@ <property name="default_width">550</property> <property name="default_height">450</property> <signal name="destroy" handler="on_xml_console_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox"> <property name="visible">True</property> ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -3256,6 +3256,10 @@ class ManageBookmarksWindow: # select root iter self.selection.select_iter(self.treestore.get_iter_first()) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_add_bookmark_button_clicked(self, widget): """ Add a new bookmark ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -3397,6 +3397,10 @@ class XMLConsoleWindow: self.xml.connect_signals(self) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_xml_console_window_destroy(self, widget): del gajim.interface.instances[self.account]['xml_console'] gajim.ged.remove_event_handler('stanza-received', ged.GUI1, @@ -4144,6 +4148,10 @@ class Archiving313PreferencesWindow: self.idle_id = GLib.timeout_add_seconds(3, self._nec_archiving_error) gajim.connections[self.account].request_archive_preferences() + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def set_widget_state(self, state): for widget in ('default_cb', 'save_button', 'add_button', 'remove_button'): @@ -4362,6 +4370,10 @@ class PrivacyListWindow: self.xml.connect_signals(self) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_privacy_list_edit_window_destroy(self, widget): key_name = 'privacy_list_%s' % self.privacy_list_name if key_name in gajim.interface.instances[self.account]: @@ -4676,6 +4688,10 @@ class PrivacyListsWindow: self.xml.connect_signals(self) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_privacy_lists_first_window_destroy(self, widget): if 'privacy_lists' in gajim.interface.instances[self.account]: del gajim.interface.instances[self.account]['privacy_lists'] ===================================== src/disco.py ===================================== --- a/src/disco.py +++ b/src/disco.py @@ -603,6 +603,10 @@ _('Without a connection, you can not browse available services')) if self.browser: self.browser.account = value + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def accel_group_func(self, accel_group, acceleratable, keyval, modifier): if (modifier & Gdk.ModifierType.CONTROL_MASK) and (keyval == Gdk.KEY_r): self.reload() ===================================== src/features_window.py ===================================== --- a/src/features_window.py +++ b/src/features_window.py @@ -25,7 +25,7 @@ import os import gi -from gi.repository import Gtk +from gi.repository import Gtk, Gdk import gtkgui_helpers from common import gajim @@ -133,6 +133,10 @@ class FeaturesWindow: self.window.show_all() self.xml.get_object('close_button').grab_focus() + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_close_button_clicked(self, widget): self.window.destroy() ===================================== src/plugins/gui.py ===================================== --- a/src/plugins/gui.py +++ b/src/plugins/gui.py @@ -29,7 +29,7 @@ __all__ = ['PluginsWindow'] from gi.repository import Pango from gi.repository import Gtk from gi.repository import GdkPixbuf -from gi.repository import GLib +from gi.repository import GLib, Gdk import os import gtkgui_helpers @@ -116,6 +116,9 @@ class PluginsWindow(object): self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() def on_plugins_notebook_switch_page(self, widget, page, page_num): GLib.idle_add(self.xml.get_object('close_button').grab_focus) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/20c000415ce8d32c62de10c99d956d012…

1 0

[Git][gajim/gajim][master] Fix typo and remove unused import
by Philipp Hörist 06 Feb '17

06 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 20c00041 by Philipp Hörist at 2017-02-06T20:52:56+01:00 Fix typo and remove unused import - - - - - 1 changed file: - src/history_manager.py Changes: ===================================== src/history_manager.py ===================================== --- a/src/history_manager.py +++ b/src/history_manager.py @@ -55,7 +55,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib import time -import locale import getopt from common import i18n @@ -84,7 +83,7 @@ def parseOpts(): config_path = a return config_path -onfig_path = parseOpts() +config_path = parseOpts() del parseOpts import common.configpaths View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/20c000415ce8d32c62de10c99d956d0125…

1 0

[Git][gajim/python-nbxmpp][master] 5 commits: Implemented smacks 3 (xep revision 1.5), the location attribute is not implemented yet
by Yann Leboulanger 06 Feb '17

06 Feb '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: 5876bdf3 by Thilo Molitor at 2016-12-31T21:00:03+01:00 Implemented smacks 3 (xep revision 1.5), the location attribute is not implemented yet - - - - - 34dccd23 by Thilo Molitor at 2017-02-05T23:36:11+01:00 Fix: request smacks ack AFTER sending out a stanza - - - - - 870b5a22 by Thilo Molitor at 2017-02-06T02:22:49+01:00 Add delay tag to message stanzas when replayed by smacks - - - - - bb4cb499 by Thilo Molitor at 2017-02-06T02:30:18+01:00 Corrected some typo (syntax error) - - - - - 5c2c0b22 by Yann Leboulanger at 2017-02-06T13:45:03+01:00 Merge branch 'smacks_rev_1.5' into 'master' Implemented smacks 3 (xep revision 1.5) See merge request !1 - - - - - 4 changed files: - nbxmpp/auth_nb.py - nbxmpp/dispatcher_nb.py - nbxmpp/protocol.py - nbxmpp/smacks.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== --- a/nbxmpp/auth_nb.py +++ b/nbxmpp/auth_nb.py @@ -734,9 +734,9 @@ class NonBlockingBind(PlugIn): self._owner.User = jid.getNode() self._owner.Resource = jid.getResource() # Only negociate stream management after bounded - sm = self._owner._caller.sm if self.supports_sm: # starts negociation + sm = self._owner._caller.sm sm.supports_sm = True sm.set_owner(self._owner) sm.negociate() @@ -745,6 +745,7 @@ class NonBlockingBind(PlugIn): if hasattr(self, 'session') and self.session == -1: # Server don't want us to initialize a session log.info('No session required.') + self._owner._caller.sm.resend_queue() #resend old messages still in the smacks queue self.on_bound('ok') else: self._owner.SendAndWaitForResponse(Protocol('iq', typ='set', @@ -763,6 +764,7 @@ class NonBlockingBind(PlugIn): if isResultNode(resp): log.info('Successfully opened session.') self.session = 1 + self._owner._caller.sm.resend_queue() #resend old messages still in the smacks queue self.on_bound('ok') else: log.error('Session open failed.') ===================================== nbxmpp/dispatcher_nb.py ===================================== --- a/nbxmpp/dispatcher_nb.py +++ b/nbxmpp/dispatcher_nb.py @@ -23,12 +23,13 @@ different handlers to different XMPP stanzas and namespaces from __future__ import unicode_literals from . import simplexml import sys +import time import locale import re import uuid from xml.parsers.expat import ExpatError from .plugin import PlugIn -from .protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, +from .protocol import (NS_DELAY2, NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED, StreamError) import logging @@ -387,7 +388,7 @@ class XMPPDispatcher(PlugIn): def UnregisterCycleHandler(self, handler): """ - Unregister handler that will is called on every Dispatcher.Process() call + Unregister handler that will be called on every Dispatcher.Process() call """ if handler in self._cycleHandlers: self._cycleHandlers.remove(handler) @@ -571,12 +572,21 @@ class XMPPDispatcher(PlugIn): # If no ID then it is a whitespace if self.sm and self.sm.enabled and ID: + # add timestamp to message stanza in queue + if stanza.getName() == 'message' and \ + (stanza.getType() == 'chat' or stanza.getType() == 'groupchat'): + our_jid = stanza.getAttr('from') + timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(None)) + stanza.addChild('delay', namespace=NS_DELAY2, + attrs={'from': our_jid, 'stamp': timestamp}) self.sm.uqueue.append(stanza) self.sm.out_h += 1 - if len(self.sm.uqueue) > self.sm.max_queue: - self.sm.request_ack() self._owner.Connection.send(stanza, now) + + if self.sm and self.sm.enabled and ID and len(self.sm.uqueue) > self.sm.max_queue: + self.sm.request_ack() + return ID ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -169,7 +169,7 @@ NS_RECEIPTS = 'urn:xmpp:receipts' NS_PUBKEY_PUBKEY = 'urn:xmpp:pubkey:2' # XEP-0189 NS_PUBKEY_REVOKE = 'urn:xmpp:revoke:2' NS_PUBKEY_ATTEST = 'urn:xmpp:attest:2' -NS_STREAM_MGMT = 'urn:xmpp:sm:2' # XEP-198 +NS_STREAM_MGMT = 'urn:xmpp:sm:3' # XEP-198 NS_HASHES = 'urn:xmpp:hashes:1' # XEP-300 NS_HASHES_MD5 = 'urn:xmpp:hash-function-textual-names:md5' NS_HASHES_SHA1 = 'urn:xmpp:hash-function-textual-names:sha-1' ===================================== nbxmpp/smacks.py ===================================== --- a/nbxmpp/smacks.py +++ b/nbxmpp/smacks.py @@ -22,7 +22,8 @@ class Smacks(object): self.session_id = None self.resumption = False # If server supports resume # Max number of stanzas in queue before making a request - self.max_queue = 5 + #be more agressive here (every message must be acked), this creates fewer message duplicates on failed resume) + self.max_queue = 0 self._owner = None self.resuming = False self.enabled = False # If SM is enabled @@ -47,6 +48,7 @@ class Smacks(object): def _neg_response(self, disp, stanza): r = stanza.getAttr('resume') + log.info("Session resumption: %s" % r) if r == 'true' or r == 'True' or r == '1': self.resumption = True self.session_id = stanza.getAttr('id') @@ -62,8 +64,8 @@ class Smacks(object): def negociate(self, resume=True): # Every time we attempt to negociate, we must erase all previous info # about any previous session + log.debug("Clearing smacks uqueue") self.uqueue = [] - self.old_uqueue = [] self.in_h = 0 self.out_h = 0 self.session_id = None @@ -73,12 +75,26 @@ class Smacks(object): stanza.buildEnable(resume) self._owner.Connection.send(stanza, now=True) + def resend_queue(self): + """ + Resends unsent stanzas when a new session is established. + This way there won't be any lost outgoing messages even on failed smacks resumes (but message duplicates are possible). + If your server supports revision 1.5 of smacks then even message duplicates are eliminated here :) + """ + if self.old_uqueue: + log.info('Session resumption failed, replaying %s stanzas anyways...' % len(self.old_uqueue)) + for i in self.old_uqueue: + self._owner.Dispatcher.send(i, False) #use this send so that our stanzas actually increment out_h + self.old_uqueue = [] + def resume_request(self): if not self.session_id: self.resuming = False log.error('Attempted to resume without a valid session id ') return - self.old_uqueue = self.uqueue #save old messages in an extra "queue" to avoid race conditions + #save old messages in an extra "queue" to avoid race conditions and to make it possible to replay stanzas even when resuming fails + #add messages here (instead of overwriting) so that repeated connection errors don't delete unacked stanzas (uqueue should be empty in this case anyways) + self.old_uqueue += self.uqueue self.uqueue = [] resume = Acks() resume.buildResume(self.in_h, self.session_id) @@ -124,6 +140,7 @@ class Smacks(object): number of stanzas received by the server. Resends stanzas not received by the server in the last session. """ + log.info("Session resumption succeeded") h = stanza.getAttr('h') if not h: log.error('Server did not send h attribute') @@ -137,7 +154,7 @@ class Smacks(object): elif len(self.old_uqueue) < diff: log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d)' % (self.out_h, h)) else: - log.info('Removing %d already received stanzas from old outgoing queue (our h: %d, server h: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, diff)) + log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, diff)) while (len(self.old_uqueue) > diff): self.old_uqueue.pop(0) @@ -160,14 +177,33 @@ class Smacks(object): self._owner.NonBlockingBind.resuming = False self._owner._on_auth_bind(None) self.failed_resume = True + + h = stanza.getTag('item-not-found').getAttr('h') + log.info('Session resumption failed (item-not-found), server h: %s' % str(h)) + if not h: + return + #prepare old_queue to contain only unacked stanzas for later resend (which is happening after our session is established properly) + h = int(h) + diff = self.out_h - h + + if diff < 0: + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d)' % (self.out_h, h)) + self.old_uqueue = [] #that's weird, but we don't resend this stanzas if the server says we don't need to + elif len(self.old_uqueue) < diff: + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d)' % (self.out_h, h)) + else: + log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, diff)) + while (len(self.old_uqueue) > diff): + self.old_uqueue.pop(0) return # Doesn't support resumption if stanza.getTag('feature-not-implemented'): + log.info('Session resumption failed (feature-not-implemented)') self.negociate(False) return if stanza.getTag('unexpected-request'): - self.enabled = False log.error('Gajim failed to negociate Stream Management') + self.enabled = False return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/ace6e018bb386132245743673…

1 0

[Git][gajim/gajim][master] 2 commits: Update strings for better english. Thanks to Allan Nordhøy for the suggestions
by Yann Leboulanger 04 Feb '17

04 Feb '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d3385722 by Yann Leboulanger at 2017-02-04T23:29:45+01:00 Update strings for better english. Thanks to Allan Nordhøy for the suggestions - - - - - a7c833f7 by Yann Leboulanger at 2017-02-04T23:31:33+01:00 Merge branch 'translations' into 'master' Update strings for better english. Thanks to Allan Nordhøy for the suggestions See merge request !51 - - - - - 30 changed files: - data/gajim-remote.1 - data/gajim.desktop.in.in - data/gui/accounts_window.ui - data/gui/history_window.ui - data/gui/preferences_window.ui - data/gui/roster_item_exchange_window.ui - plugins/dbus_plugin/plugin.py - src/application.py - src/chat_control.py - src/chat_control_base.py - src/command_system/mapping.py - src/common/config.py - src/common/connection.py - src/common/connection_handlers_events.py - src/common/helpers.py - src/config.py - src/conversation_textview.py - src/dataforms_widget.py - src/dialogs.py - src/features_window.py - src/filetransfers_window.py - src/gajim-remote.py - src/gajim.py - src/gajim_themes_window.py - src/groupchat_control.py - src/gtkgui_helpers.py - src/gui_interface.py - src/gui_menu_builder.py - src/history_manager.py - src/htmltextview.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7932cdf123115db2e790552372c0b805d…

1 0

[Git][gajim/gajim][master] 2 commits: Fix drag and drop on a group.
by Philipp Hörist 04 Feb '17

04 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 89f861c8 by Tomasz Miąsko at 2017-02-04T17:24:31+01:00 Fix drag and drop on a group. - - - - - 7932cdf1 by Philipp Hörist at 2017-02-04T17:32:58+01:00 Merge branch 'drag-and-drop-on-group' into 'master' Fix drag and drop on a group. See merge request !50 - - - - - 1 changed file: - src/roster_window.py Changes: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -4536,7 +4536,7 @@ class RosterWindow: self.remove_contact_from_groups(c_source.jid, account, [grp_source]) - if context.get_action() in (Gdk.DragAction.MOVE, Gdk.DragAction.COPY): + if context.get_actions() in (Gdk.DragAction.MOVE, Gdk.DragAction.COPY): context.finish(True, True, etime) def drag_drop(self, treeview, context, x, y, timestamp): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/92f52bbcbdefbeac72d2534e35fda8704…

1 0

[Git][gajim/gajim][master] 2 commits: Fix roster popup menu.
by Yann Leboulanger 03 Feb '17

03 Feb '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 38581b70 by Tomasz Miąsko at 2017-02-03T11:21:06+01:00 Fix roster popup menu. Replace Gdk.Event with Gdk.Event.new, so that event is constructed with correct type information. This fixes showing a roster popup menu when launched using keyboard shortcut (Menu key or Shift-F10). - - - - - 92f52bbc by Yann Leboulanger at 2017-02-03T12:13:54+01:00 Merge branch 'roster-popup-menu' into 'master' Fix roster popup menu. See merge request !49 - - - - - 1 changed file: - src/roster_window.py Changes: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -3967,7 +3967,7 @@ class RosterWindow: self.on_history(widget, contact, account) def on_roster_window_popup_menu(self, widget): - event = Gdk.Event(Gdk.EventType.KEY_PRESS) + event = Gdk.Event.new(Gdk.EventType.KEY_PRESS) self.show_treeview_menu(event) def on_row_activated(self, widget, path): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a15f37aee34c5aaa7c1210490bf97dd75…

1 0

[Git][gajim/gajim][gajim_0.16] Fix KeyError when privacy list is received
by Philipp Hörist 02 Feb '17

02 Feb '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: ff94fe39 by Philipp Hörist at 2017-02-02T19:56:24+01:00 Fix KeyError when privacy list is received - - - - - 1 changed file: - src/common/connection.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -2441,10 +2441,11 @@ class Connection(CommonConnection, ConnectionHandlers): self.blocked_groups.append(rule['value']) self.blocked_list.append(rule) - if rule['type'] == 'jid': - roster.draw_contact(rule['value'], self.name) - if rule['type'] == 'group': - roster.draw_group(rule['value'], self.name) + if 'type' in rule: + if rule['type'] == 'jid': + roster.draw_contact(rule['value'], self.name) + if rule['type'] == 'group': + roster.draw_group(rule['value'], self.name) def _request_bookmarks_xml(self): if not gajim.account_is_connected(self.name): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff94fe398f7c73088961e2c4324ca1d17f…

1 0

[Git][gajim/gajim] Pushed new tag gajim-0.16.7
by Yann Leboulanger 01 Feb '17

01 Feb '17

Yann Leboulanger pushed new tag gajim-0.16.7 at gajim / gajim

1 0

[Git][gajim/gajim] Deleted tag gajim-0.16.7
by Yann Leboulanger 01 Feb '17

01 Feb '17

Yann Leboulanger deleted tag gajim-0.16.7 at gajim / gajim

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