Commits February 2017

commits@gajim.org

1 participants
28 discussions

[Git][gajim/gajim][gajim_0.16] check for errors when adding a transport contact. Fixes #8196
by Yann Leboulanger 28 Feb '17

28 Feb '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: d2782622 by Yann Leboulanger at 2017-02-28T22:28:49+01:00 check for errors when adding a transport contact. Fixes #8196 - - - - - 1 changed file: - src/dialogs.py Changes: ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -1249,6 +1249,11 @@ class AddNewContactWindow: def _nec_gateway_prompt_received(self, obj): if self.adding_jid: jid, transport, type_ = self.adding_jid + if obj.stanza.getError(): + ErrorDialog(_('Error while adding transport contact'), + _('This error occured while adding a contact for transport ' + '%s:\n\n%s') % (transport, obj.stanza.getErrorMsg())) + return if obj.prompt_jid: self._add_jid(obj.prompt_jid, type_) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d2782622952a3cc45dbc87d0e948507316…

1 0

[Git][gajim/gajim][master] Lookup action in correct window Fixes #8560
by Philipp Hörist 28 Feb '17

28 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 54502446 by Philipp Hörist at 2017-02-28T16:49:01+01:00 Lookup action in correct window Fixes #8560 - - - - - 1 changed file: - src/message_window.py Changes: ===================================== src/message_window.py ===================================== --- a/src/message_window.py +++ b/src/message_window.py @@ -98,7 +98,7 @@ class MessageWindow(object): else: self.parent_paned.add(self.notebook) self.parent_paned.pack2(self.notebook, resize=True, shrink=True) - get_action('show-roster').set_enabled(True) + self.window.lookup_action('show-roster').set_enabled(True) orig_window.destroy() del orig_window @@ -626,7 +626,7 @@ class MessageWindow(object): # Don't close parent window, just remove the child child = self.parent_paned.get_child2() self.parent_paned.remove(child) - get_action('show-roster').set_enabled(False) + self.window.lookup_action('show-roster').set_enabled(False) else: self.window.destroy() return # don't show_title, we are dead @@ -1272,7 +1272,7 @@ class MessageWindowMgr(GObject.GObject): # Don't close parent window, just remove the child child = w.parent_paned.get_child2() w.parent_paned.remove(child) - get_action('show-roster').set_enabled(False) + self.parent_win.lookup_action('show-roster').set_enabled(False) gtkgui_helpers.resize_window(w.window, gajim.config.get('roster_width'), gajim.config.get('roster_height')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/54502446a31bfc09d9e09094f4a7b2670f…

1 0

[Git][gajim/gajim][master] Add certifi to windows dependencys
by Philipp Hörist 27 Feb '17

27 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 86faba26 by Philipp Hörist at 2017-02-27T23:14:37+01:00 Add certifi to windows dependencys - - - - - 2 changed files: - requirements.txt - setup_win32.py Changes: ===================================== requirements.txt ===================================== --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,4 @@ pillow pycurl docutils qrcode +certifi ===================================== setup_win32.py ===================================== --- a/setup_win32.py +++ b/setup_win32.py @@ -118,7 +118,7 @@ OPTIONS = { 'includes': ['gi', 'numbers', 'win32com.client', 'win32com.server'], 'packages': ['gi', 'cffi', 'cryptography', 'google', 'axolotl', 'pkg_resources', 'Crypto', 'pycparser', 'keyring', - 'PIL', 'idna', 'qrcode'], + 'PIL', 'idna', 'qrcode', 'certifi'], 'include_files': INCLUDE_FILES, } } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/86faba2649dd92d2217a65778a308ad087…

1 0

[Git][gajim/gajim][master] Add extension point in plugins window
by Philipp Hörist 25 Feb '17

25 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a1a326b by Philipp Hörist at 2017-02-25T19:21:21+01:00 Add extension point in plugins window - - - - - 1 changed file: - src/plugins/gui.py Changes: ===================================== src/plugins/gui.py ===================================== --- a/src/plugins/gui.py +++ b/src/plugins/gui.py @@ -114,10 +114,8 @@ class PluginsWindow(object): self.plugins_notebook.set_current_page(0) self.xml.get_object('close_button').grab_focus() - for plugin in gajim.plugin_manager.active_plugins: - if type(plugin).__name__ == 'PluginInstaller': - plugin.on_activate(self) - break + # Adding GUI extension point for Plugins that want to hook the Plugin Window + gajim.plugin_manager.gui_extension_point('plugin_window', self) self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8a1a326bae3f04d6824f4915f4ba85b3f5…

1 0

[Git][gajim/gajim][master] Parse log arguments earlier
by Philipp Hörist 25 Feb '17

25 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ddf60b01 by Philipp Hörist at 2017-02-25T17:21:03+01:00 Parse log arguments earlier - - - - - 2 changed files: - src/common/logging_helpers.py - src/gajim.py Changes: ===================================== src/common/logging_helpers.py ===================================== --- a/src/common/logging_helpers.py +++ b/src/common/logging_helpers.py @@ -19,6 +19,8 @@ ## import logging +import os +import sys def parseLogLevel(arg): """ @@ -132,10 +134,14 @@ class FancyFormatter(logging.Formatter): return logging.Formatter.format(self, record) -def init(use_color=False): +def init(): """ Iinitialize the logging system """ + use_color = False + if os.name != 'nt': + use_color = sys.stderr.isatty() + consoleloghandler = logging.StreamHandler() consoleloghandler.setFormatter( FancyFormatter( @@ -171,7 +177,7 @@ def set_quiet(): # tests if __name__ == '__main__': - init(use_color=True) + init() set_loglevels('gajim.c=DEBUG,INFO') ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -60,9 +60,6 @@ except ImportError: print('PyOpenSSL not available, impossible to generate entropy', file=sys.stderr) PYOPENSSL_PRNG_PRESENT = False -logging_helpers.init(sys.stderr.isatty()) -log = logging.getLogger('gajim.gajim') - MIN_NBXMPP_VER = "0.5.3" @@ -264,6 +261,9 @@ class GajimApplication(Gtk.Application): self.interface.roster.prepare_quit() def do_handle_local_options(self, options: GLib.VariantDict) -> int: + + logging_helpers.init() + if options.contains('profile'): # Incorporate profile name into application id # to have a single app instance for each profile. @@ -279,18 +279,17 @@ class GajimApplication(Gtk.Application): from common.defs import version print(version) return 0 + if options.contains('quiet'): + logging_helpers.set_quiet(True) + if options.contains('verbose'): + logging_helpers.set_verbose(True) + if options.contains('loglevel'): + loglevel = options.lookup_value('loglevel').get_string() + logging_helpers.set_loglevels(loglevel) return -1 def do_command_line(self, command_line: Gio.ApplicationCommandLine) -> int: Gtk.Application.do_command_line(self, command_line) - options = command_line.get_options_dict() - if options.contains('quiet'): - logging_helpers.set_quiet() - if options.contains('verbose'): - logging_helpers.set_verbose() - if options.contains('loglevel'): - string = options.lookup_value('loglevel').get_string() - logging_helpers.set_loglevels(string) if not command_line.get_is_remote(): self.activate() return 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ddf60b01b37e407de668c5240759897b2d…

1 0

[Git][gajim/gajim][master] 4 commits: Activate PluginInstaller in plugin window init
by Philipp Hörist 25 Feb '17

25 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: a606d0ed by Philipp Hörist at 2017-02-19T18:13:10+01:00 Activate PluginInstaller in plugin window init - - - - - 8e860561 by Philipp Hörist at 2017-02-23T17:56:19+01:00 Add scanning single plugins - - - - - 5c11e240 by Philipp Hörist at 2017-02-23T17:57:11+01:00 Reload plugins if already loaded - - - - - a40c0784 by Philipp Hörist at 2017-02-25T15:37:33+01:00 Merge branch 'small-fixes' into 'master' Plugin Installer Version 0.18 See merge request !61 - - - - - 2 changed files: - src/plugins/gui.py - src/plugins/pluginmanager.py Changes: ===================================== src/plugins/gui.py ===================================== --- a/src/plugins/gui.py +++ b/src/plugins/gui.py @@ -114,6 +114,11 @@ class PluginsWindow(object): self.plugins_notebook.set_current_page(0) self.xml.get_object('close_button').grab_focus() + for plugin in gajim.plugin_manager.active_plugins: + if type(plugin).__name__ == 'PluginInstaller': + plugin.on_activate(self) + break + self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) ===================================== src/plugins/pluginmanager.py ===================================== --- a/src/plugins/pluginmanager.py +++ b/src/plugins/pluginmanager.py @@ -403,20 +403,25 @@ class PluginManager(metaclass=Singleton): @staticmethod @log_calls('PluginManager') - def scan_dir_for_plugins(path, scan_dirs=True): + def scan_dir_for_plugins(path, scan_dirs=True, package=False): r''' Scans given directory for plugin classes. :param path: directory to scan for plugins :type path: str + :param scan_dirs: folders inside path are processed as modules + :type scan_dirs: boolean + + :param package: if path points to a single package folder + :type package: boolean + :return: list of found plugin classes (subclasses of `GajimPlugin` :rtype: [] of class objects :note: currently it only searches for plugin classes in '\*.py' files present in given direcotory `path` (no recursion here) - :todo: add scanning packages :todo: add scanning zipped modules ''' from plugins.plugins_i18n import _ @@ -427,7 +432,11 @@ class PluginManager(metaclass=Singleton): if not os.path.isdir(path): return plugins_found - dir_list = os.listdir(path) + if package: + path, package_name = os.path.split(path) + dir_list = [package_name] + else: + dir_list = os.listdir(path) sys.path.insert(0, path) @@ -439,6 +448,8 @@ class PluginManager(metaclass=Singleton): elif os.path.isdir(file_path) and scan_dirs: module_name = elem_name file_path += os.path.sep + else: + continue manifest_path = os.path.join(os.path.dirname(file_path), 'manifest.ini') @@ -482,11 +493,14 @@ class PluginManager(metaclass=Singleton): module = None - if module_name in sys.modules: - # do not load the module twice - continue try: - module = __import__(module_name) + if module_name in sys.modules: + from imp import reload + log.info('Reloading %s', module_name) + module = reload(sys.modules[module_name]) + else: + log.info('Loading %s', module_name) + module = __import__(module_name) except Exception as error: log.warning( "While trying to load {plugin}, exception occurred".format(plugin=elem_name), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/18df7163d11c72800cb902377962d7550…

1 0

[Git][gajim/gajim][master] 2 commits: Fix endless loop in various CellRenderers
by Philipp Hörist 19 Feb '17

19 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: dd3a2f3a by Philipp Hörist at 2017-02-19T18:07:06+01:00 Fix endless loop in various CellRenderers context.get_background_color() first calls the CellRenderer to render the cell before giving back the color. When we call this inside a CellRenderer, this is an endless loop - - - - - 18df7163 by Philipp Hörist at 2017-02-19T18:10:13+01:00 Merge branch 'roster' into 'master' Fix endless loop in various CellRenderers See merge request !59 - - - - - 2 changed files: - src/groupchat_control.py - src/roster_window.py Changes: ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -75,18 +75,6 @@ class Column(IntEnum): empty_pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 1, 1) empty_pixbuf.fill(0xffffff00) -def set_renderer_color(treeview, renderer, set_background=True): - """ - Set style for group row, using PRELIGHT system color - """ - context = treeview.get_style_context() - if set_background: - bgcolor = context.get_background_color(Gtk.StateFlags.PRELIGHT) - renderer.set_property('cell-background-rgba', bgcolor) - else: - fgcolor = context.get_color(Gtk.StateFlags.PRELIGHT) - renderer.set_property('foreground-rgba', fgcolor) - def tree_cell_data_func(column, renderer, model, iter_, tv=None): # cell data func is global, because we don't want it to keep # reference to GroupchatControl instance (self) @@ -123,17 +111,11 @@ def tree_cell_data_func(column, renderer, model, iter_, tv=None): gtkgui_helpers.get_theme_font_for_option(theme, 'contactfont')) else: # it is root (eg. group) bgcolor = gajim.config.get_per('themes', theme, 'groupbgcolor') - if bgcolor: - renderer.set_property('cell-background', bgcolor) - else: - set_renderer_color(tv, renderer) + renderer.set_property('cell-background', bgcolor or None) if isinstance(renderer, Gtk.CellRendererText): # foreground property is only with CellRendererText color = gajim.config.get_per('themes', theme, 'grouptextcolor') - if color: - renderer.set_property('foreground', color) - else: - set_renderer_color(tv, renderer, False) + renderer.set_property('foreground', color or None) renderer.set_property('font', gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont')) ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -4814,19 +4814,6 @@ class RosterWindow: if ctrl: ctrl.show_avatar() - def set_renderer_color(self, renderer, style, set_background=True): - """ - Set style for treeview cell, using PRELIGHT system color - """ - if set_background: - context = self.tree.get_style_context() - bgcolor = context.get_background_color(style) - renderer.set_property('cell-background-rgba', bgcolor) - else: - context = self.tree.get_style_context() - fgcolor = context.get_color(style) - renderer.set_property('foreground-rgba', fgcolor) - def _iconCellDataFunc(self, column, renderer, model, titer, data=None): """ When a row is added, set properties for icon renderer @@ -4871,10 +4858,7 @@ class RosterWindow: theme = gajim.config.get('roster_theme') if type_ == 'account': color = gajim.config.get_per('themes', theme, 'accounttextcolor') - if color: - renderer.set_property('foreground', color) - else: - self.set_renderer_color(renderer, Gtk.StateFlags.ACTIVE, False) + renderer.set_property('foreground', color or None) renderer.set_property('font', gtkgui_helpers.get_theme_font_for_option(theme, 'accountfont')) renderer.set_property('xpad', 0) @@ -4882,10 +4866,7 @@ class RosterWindow: self._set_account_row_background_color(renderer) elif type_ == 'group': color = gajim.config.get_per('themes', theme, 'grouptextcolor') - if color: - renderer.set_property('foreground', color) - else: - self.set_renderer_color(renderer, Gtk.StateFlags.PRELIGHT, False) + renderer.set_property('foreground', color or None) renderer.set_property('font', gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont')) parent_iter = model.iter_parent(titer) @@ -5012,10 +4993,7 @@ class RosterWindow: def _set_account_row_background_color(self, renderer): theme = gajim.config.get('roster_theme') color = gajim.config.get_per('themes', theme, 'accountbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - self.set_renderer_color(renderer, Gtk.StateFlags.ACTIVE) + renderer.set_property('cell-background', color or None) def _set_contact_row_background_color(self, renderer, jid, account): theme = gajim.config.get('roster_theme') @@ -5027,15 +5005,12 @@ class RosterWindow: 'just_disconnected_bg_color')) else: color = gajim.config.get_per('themes', theme, 'contactbgcolor') - renderer.set_property('cell-background', color if color else None) + renderer.set_property('cell-background', color or None) def _set_group_row_background_color(self, renderer): theme = gajim.config.get('roster_theme') color = gajim.config.get_per('themes', theme, 'groupbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - self.set_renderer_color(renderer, Gtk.StateFlags.PRELIGHT) + renderer.set_property('cell-background', color or None) ################################################################################ ### Everything about building menus View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4a7e54347cdda4fbca328d2d1bb365128…

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Send smacks ack directly before stream close
by Philipp Hörist 13 Feb '17

13 Feb '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e30565e2 by Thilo Molitor at 2017-02-14T00:17:34+01:00 Send smacks ack directly before stream close - - - - - abc42a9b by Philipp Hörist at 2017-02-14T00:20:36+01:00 Merge branch 'smacks_rev_1.5' into 'master' Smacks rev 1.5.2 See merge request !5 - - - - - 2 changed files: - nbxmpp/smacks.py - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/smacks.py ===================================== --- a/nbxmpp/smacks.py +++ b/nbxmpp/smacks.py @@ -1,5 +1,6 @@ from .protocol import Acks from .protocol import NS_STREAM_MGMT +from .transports_nb import CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING import logging log = logging.getLogger('nbxmpp.smacks') @@ -104,6 +105,14 @@ class Smacks(object): ack = Acks() ack.buildAnswer(self.in_h) self._owner.Connection.send(ack, False) + + def send_closing_ack(self): + if self._owner.Connection.get_state() != DISCONNECTING: + log.error("Not allowed to send closing smacks ack when not disconnecting!") + return + ack = Acks() + ack.buildAnswer(self.in_h) + self._owner.Connection.send(ack, True) def request_ack(self): r = Acks() ===================================== nbxmpp/transports_nb.py ===================================== --- a/nbxmpp/transports_nb.py +++ b/nbxmpp/transports_nb.py @@ -304,6 +304,8 @@ class NonBlockingTransport(PlugIn): # FIXME: where and why does this need to be called def start_disconnect(self): self.set_state(DISCONNECTING) + if self._owner._caller.sm and self._owner._caller.sm.enabled: + self._owner._caller.sm.send_closing_ack() class NonBlockingTCP(NonBlockingTransport, IdleObject): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/ed4a9e051c142eb1ebc463436…

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Fix smacks delayed tag addition.
by Philipp Hörist 13 Feb '17

13 Feb '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 279ec6b8 by Thilo Molitor at 2017-02-13T23:11:54+01:00 Fix smacks delayed tag addition. Only add delayed tag to stanzas saved into smacks queue, not to the ones send out directly. - - - - - 027b7a30 by Thilo Molitor at 2017-02-13T23:11:54+01:00 Fix bug in failed smacks resumption Extract correct h value when session resumption failed. Add some more logging output. - - - - - ed4a9e05 by Philipp Hörist at 2017-02-13T23:15:43+01:00 Merge branch 'smacks_rev_1.5' into 'master' Fix smacks delayed tag addition. See merge request !3 - - - - - 2 changed files: - nbxmpp/dispatcher_nb.py - nbxmpp/smacks.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== --- a/nbxmpp/dispatcher_nb.py +++ b/nbxmpp/dispatcher_nb.py @@ -27,6 +27,7 @@ import time import locale import re import uuid +import copy from xml.parsers.expat import ExpatError from .plugin import PlugIn from .protocol import (NS_DELAY2, NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, @@ -572,14 +573,15 @@ class XMPPDispatcher(PlugIn): # If no ID then it is a whitespace if self.sm and self.sm.enabled and ID: + stanza_copy = copy.deepcopy(stanza) # add timestamp to message stanza in queue - if stanza.getName() == 'message' and \ - (stanza.getType() == 'chat' or stanza.getType() == 'groupchat'): - our_jid = stanza.getAttr('from') + if stanza_copy.getName() == 'message' and \ + (stanza_copy.getType() == 'chat' or stanza_copy.getType() == 'groupchat'): + our_jid = stanza_copy.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) + stanza_copy.addChild('delay', namespace=NS_DELAY2, + attrs={'from': our_jid or "Gajim", 'stamp': timestamp}) + self.sm.uqueue.append(stanza_copy) self.sm.out_h += 1 self._owner.Connection.send(stanza, now) ===================================== nbxmpp/smacks.py ===================================== --- a/nbxmpp/smacks.py +++ b/nbxmpp/smacks.py @@ -124,13 +124,13 @@ class Smacks(object): diff = self.out_h - h if diff < 0: - log.error('Server and client number of stanzas handled mismatch (our h: %d, server h: %d)' % (self.out_h, h)) + log.error('Server and client number of stanzas handled mismatch (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.uqueue))) while (len(self.uqueue)): #don't accumulate all messages in this case (they would otherwise all be resent on the next reconnect) self.uqueue.pop(0) elif len(self.uqueue) < diff: - log.error('Server and client number of stanzas handled mismatch (our h: %d, server h: %d)' % (self.out_h, h)) + log.error('Server and client number of stanzas handled mismatch (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.uqueue))) else: - log.debug('Got ack for outgoing stanzas (our h: %d, server h: %d), removing %d messages from queue...' % (self.out_h, h, len(self.uqueue) - diff)) + log.debug('Got ack for outgoing stanzas (our h: %d, server h: %d, #queue: %d), removing %d messages from queue...' % (self.out_h, h, len(self.uqueue), len(self.uqueue) - diff)) while (len(self.uqueue) > diff): self.uqueue.pop(0) @@ -149,12 +149,12 @@ class Smacks(object): 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)) + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d. #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) 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)) + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) 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)) + log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, #queue: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, len(self.old_uqueue), diff)) while (len(self.old_uqueue) > diff): self.old_uqueue.pop(0) @@ -178,7 +178,7 @@ class Smacks(object): self._owner._on_auth_bind(None) self.failed_resume = True - h = stanza.getTag('item-not-found').getAttr('h') + h = stanza.getAttr('h') log.info('Session resumption failed (item-not-found), server h: %s' % str(h)) if not h: return @@ -187,12 +187,12 @@ class Smacks(object): 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)) + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) 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)) + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d, #queue: %d)' % (self.out_h, h, len(self.old_uqueue))) 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)) + log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, #queue: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, len(self.old_uqueue), diff)) while (len(self.old_uqueue) > diff): self.old_uqueue.pop(0) return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/8f1c3b113c75f1f81fcdd8807…

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Save own full jid
by Philipp Hörist 13 Feb '17

13 Feb '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 171bac23 by Philipp Hörist at 2017-02-13T00:18:28+01:00 Save own full jid - - - - - 8f1c3b11 by Philipp Hörist at 2017-02-13T22:45:15+01:00 Merge branch 'master' into 'master' Save own full jid See merge request !4 - - - - - 1 changed file: - nbxmpp/auth_nb.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== --- a/nbxmpp/auth_nb.py +++ b/nbxmpp/auth_nb.py @@ -731,6 +731,7 @@ class NonBlockingBind(PlugIn): self.bound.append(resp.getTag('bind').getTagData('jid')) log.info('Successfully bound %s.' % self.bound[-1]) jid = JID(resp.getTag('bind').getTagData('jid')) + self._owner._registered_name = jid self._owner.User = jid.getNode() self._owner.Resource = jid.getResource() # Only negociate stream management after bounded View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/5c2c0b22f09c8bc541046f91f…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2017