Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 4 commits: Remove unused vars
by Philipp Hörist 10 Jan '19

10 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 247ee813 by Philipp Hörist at 2019-01-10T20:37:47Z Remove unused vars - - - - - 418459b6 by Philipp Hörist at 2019-01-10T20:50:49Z DBus: Add some logging - - - - - 5b1f8bcc by Philipp Hörist at 2019-01-10T21:07:52Z Make sure args are always str - - - - - 911674d5 by Philipp Hörist at 2019-01-10T21:08:11Z Fix status tray notification Clicking on a new message notification in the status tray didnt open the chat - - - - - 4 changed files: - gajim/gtk/notification.py - gajim/gui_interface.py - gajim/remote_control.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -89,7 +89,7 @@ class Notification: def _nec_notification(self, obj): if obj.do_popup: icon_name = self._get_icon_name(obj) - self.popup(obj.popup_event_type, obj.jid, obj.conn.name, + self.popup(obj.popup_event_type, str(obj.jid), obj.conn.name, obj.popup_msg_type, icon_name=icon_name, title=obj.popup_title, text=obj.popup_text, timeout=obj.popup_timeout) @@ -219,7 +219,7 @@ class Notification: @staticmethod def _make_id(*args): - return ','.join(args) + return ','.join(map(str, args)) class PopupNotification(Gtk.Window): ===================================== gajim/gui_interface.py ===================================== @@ -1470,10 +1470,13 @@ class Interface: app.events.change_jid(account, fjid, jid) resource = None fjid = jid + contact = None if resource: - contact = app.contacts.get_contact(account, jid, resource) or highest_contact - if contact is None: + contact = app.contacts.get_contact(account, jid, resource) + if not contact: + contact = highest_contact + if not contact: # Maybe we deleted the contact from the roster return @@ -2507,8 +2510,6 @@ class Interface: app.gajim_optional_features[a] = [] app.caps_hash[a] = '' - self.remote_ctrl = None - # Handle screensaver if sys.platform not in ('win32', 'darwin'): logind.enable() ===================================== gajim/remote_control.py ===================================== @@ -25,6 +25,7 @@ import os import base64 import mimetypes +import logging from gi.repository import GLib from gi.repository import Gio @@ -36,6 +37,8 @@ from gajim.common import ged from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.connection_handlers_events import GcMessageOutgoingEvent +log = logging.getLogger('gajim.remote_control') + def get_dbus_struct(obj): """ @@ -405,6 +408,7 @@ class GajimRemote(Server): self.raise_signal('VcardInfo', (obj.conn.name, obj.vcard_dict)) def raise_signal(self, event_name, data): + log.info('Send event %s', event_name) self.con.emit_signal(None, '/org/gajim/dbus/RemoteObject', 'org.gajim.dbus.RemoteInterface', ===================================== test/lib/gajim_mocks.py ===================================== @@ -102,7 +102,6 @@ class MockInterface(Mock): from gajim import plugins app.plugin_manager = plugins.PluginManager() - self.remote_ctrl = None self.instances = {} self.minimized_controls = {} self.status_sent_to_users = Mock() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b84054b58cf940061d494c75496e45d7f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b84054b58cf940061d494c75496e45d7f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DBus: Correctly raise NewMessage signal
by Philipp Hörist 10 Jan '19

10 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b84054b5 by Philipp Hörist at 2019-01-10T20:34:17Z DBus: Correctly raise NewMessage signal - - - - - 2 changed files: - gajim/remote_control.py - gajim/session.py Changes: ===================================== gajim/remote_control.py ===================================== @@ -312,6 +312,8 @@ class GajimRemote(Server): ged.POSTGUI, self.on_unsubscribed_presence_received) app.ged.register_event_handler('gc-message-received', ged.POSTGUI, self.on_gc_message_received) + app.ged.register_event_handler('decrypted-message-received', + ged.POSTGUI, self._nec_decrypted_message_received) app.ged.register_event_handler('our-show', ged.POSTGUI, self.on_our_status) app.ged.register_event_handler('account-created', ged.POSTGUI, @@ -387,6 +389,12 @@ class GajimRemote(Server): obj.timestamp, obj.delayed, obj.xhtml_msgtxt, obj.displaymarking, obj.needs_highlight])) + def _nec_decrypted_message_received(self, obj): + self.raise_signal('NewMessage', ( + obj.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp, + obj.encrypted, obj.mtype, obj.subject, + obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node])) + def on_our_status(self, obj): self.raise_signal('AccountPresence', (obj.show, obj.conn.name)) ===================================== gajim/session.py ===================================== @@ -168,12 +168,6 @@ class ChatControlSession: if not pm: self.roster_message2(obj) - if app.interface.remote_ctrl: - app.interface.remote_ctrl.raise_signal('NewMessage', ( - self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp, - obj.encrypted, obj.mtype, obj.subject, - obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node])) - def roster_message2(self, obj): """ Display the message or show notification in the roster View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b84054b58cf940061d494c75496e45d7f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b84054b58cf940061d494c75496e45d7f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Windows: Use correct nbxmpp version
by Philipp Hörist 08 Jan '19

08 Jan '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 60f8c52c by Philipp Hörist at 2019-01-08T21:38:25Z Windows: Use correct nbxmpp version - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -100,7 +100,7 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six PIP_REQUIREMENTS="\ -nbxmpp==0.6.8 +nbxmpp==0.6.9 git+https://dev.gajim.org/lovetox/pybonjour-python3.git git+https://github.com/enthought/pywin32-ctypes.git keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/60f8c52c3acf6836efa7a30caec14e89e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/60f8c52c3acf6836efa7a30caec14e89e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 6 commits: Use custom link handler in AboutDialog
by Philipp Hörist 08 Jan '19

08 Jan '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: c2d69774 by Philipp Hörist at 2019-01-08T19:07:00Z Use custom link handler in AboutDialog Fixes #9525 - - - - - af4e06ca by André Apitzsch at 2019-01-08T19:07:27Z Bump copyright year - - - - - 5329190d by Sebastiaan Lokhorst at 2019-01-08T19:18:47Z Fix Bonjour (pybonjour) on macOS - - - - - 2ad179df by Philipp Hörist at 2019-01-08T19:20:12Z Better determine language cross platform - - - - - ad5a8fd3 by Philipp Hörist at 2019-01-08T19:21:47Z Pass xml:lang to nbxmpp - - - - - f29bf456 by Philipp Hörist at 2019-01-08T21:32:40Z Raise nbxmpp version - - - - - 10 changed files: - README.md - data/gajim-history-manager.1 - data/gajim-remote.1 - data/gajim.1 - gajim/common/app.py - gajim/common/connection.py - gajim/common/i18n.py - gajim/gajim.py - gajim/gtk/about.py - setup.cfg Changes: ===================================== README.md ===================================== @@ -7,7 +7,7 @@ - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) -- python3-nbxmpp +- python3-nbxmpp (>=0.6.9,<0.7.0) - python3-openssl (>=0.14) - python3-cssutils (>=1.0.2) - python3-keyring @@ -17,7 +17,7 @@ - python3-pil (pillow) for support of webp avatars - python3-gnupg to enable GPG encryption -- For zeroconf (bonjour) you need python3-dbus +- For zeroconf you need python3-dbus on Linux or [pybonjour](https://dev.gajim.org/lovetox/pybonjour-python3) on Windows/macOS - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working @@ -86,7 +86,7 @@ Execute gajim with --verbose That is all, **enjoy**! -(C) 2003-2018 +(C) 2003-2019 The Gajim Team [https://gajim.org](https://gajim.org) ===================================== data/gajim-history-manager.1 ===================================== @@ -46,7 +46,7 @@ and .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2018 Gajim Team +Copyright (C) 2003-2019 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. ===================================== data/gajim-remote.1 ===================================== @@ -89,7 +89,7 @@ and .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2018 Gajim Team +Copyright (C) 2003-2019 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. ===================================== data/gajim.1 ===================================== @@ -93,7 +93,7 @@ and with contributions and patches merged from many individuals around the world. See the About Dialog for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2018 Gajim Team +Copyright (C) 2003-2019 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. ===================================== gajim/common/app.py ===================================== @@ -200,12 +200,14 @@ def detect_dependencies(): # ZEROCONF try: - if os.name == 'nt': - import pybonjour # pylint: disable=unused-variable - _dependencies['PYBONJOUR'] = True - else: - import dbus # pylint: disable=unused-variable - _dependencies['PYTHON-DBUS'] = True + import pybonjour # pylint: disable=unused-variable + _dependencies['PYBONJOUR'] = True + except Exception: + pass + + try: + import dbus # pylint: disable=unused-variable + _dependencies['PYTHON-DBUS'] = True except Exception: pass ===================================== gajim/common/connection.py ===================================== @@ -56,6 +56,7 @@ from gajim.common import app from gajim.common import gpg from gajim.common import passwords from gajim.common import idle +from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact @@ -1037,7 +1038,8 @@ class Connection(CommonConnection, ConnectionHandlers): con = nbxmpp.NonBlockingClient( domain=self._hostname, caller=self, - idlequeue=app.idlequeue) + idlequeue=app.idlequeue, + lang=i18n.LANG) # increase default timeout for server responses nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ ===================================== gajim/common/i18n.py ===================================== @@ -69,6 +69,22 @@ def iter_locale_dirs(): if locale_dir.is_dir(): yield str(locale_dir) +def get_default_lang(): + if os.name == "nt": + import ctypes + windll = ctypes.windll.kernel32 + lang = locale.windows_locale[windll.GetUserDefaultUILanguage()] + return lang[:2] + + if sys.platform == "darwin": + from AppKit import NSLocale + return NSLocale.currentLocale().languageCode() + + default = locale.getdefaultlocale()[0] + if default is not None: + return default[:2] + return 'en' + def initialize_direction_mark(): from gi.repository import Gtk @@ -137,15 +153,13 @@ try: except locale.Error as error: print(error) -if os.name == 'nt': - try: - # en_US, fr_FR, el_GR etc.. - default = locale.getdefaultlocale()[0] - if default is not None: - LANG = default[:2] - except (ValueError, locale.Error): - pass - os.environ['LANG'] = LANG +try: + LANG = get_default_lang() + print('Found default language: %s' % LANG) +except Exception as error: + print('Failed to determine default language') + import traceback + traceback.print_exc() # Search for the translation in all locale dirs for dir_ in iter_locale_dirs(): ===================================== gajim/gajim.py ===================================== @@ -27,7 +27,7 @@ from distutils.version import LooseVersion as V # Install _() in namespace from gajim.common import i18n -_MIN_NBXMPP_VER = "0.6.8" +_MIN_NBXMPP_VER = "0.6.9" _MIN_GTK_VER = "3.22.0" ===================================== gajim/gtk/about.py ===================================== @@ -14,10 +14,12 @@ import nbxmpp +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GObject from gajim.common import app +from gajim.common.helpers import launch_browser_mailer from gajim.common.i18n import _ from gajim.common.const import DEVS_CURRENT from gajim.common.const import DEVS_PAST @@ -31,7 +33,7 @@ class AboutDialog(Gtk.AboutDialog): self.set_transient_for(app.interface.roster.window) self.set_name('Gajim') self.set_version(app.version) - self.set_copyright('Copyright © 2003-2018 Gajim Team') + self.set_copyright('Copyright © 2003-2019 Gajim Team') self.set_license_type(Gtk.License.GPL_3_0_ONLY) self.set_website('https://gajim.org/') @@ -65,3 +67,25 @@ class AboutDialog(Gtk.AboutDialog): 'response', lambda dialog, *args: Gtk.AboutDialog.do_close(dialog)) self.show() + self.connect('activate-link', self._on_activate_link) + # See https://gitlab.gnome.org/GNOME/gtk/issues/1561 + self._connect_link_handler(self) + + @staticmethod + def _on_activate_link(_label, uri): + # We have to use this, because the default GTK handler + # is not cross-platform compatible + launch_browser_mailer(None, uri) + return Gdk.EVENT_STOP + + def _connect_link_handler(self, parent): + def _find_child(parent_): + if not hasattr(parent_, 'get_children'): + return + + for child in parent_.get_children(): + if isinstance(child, Gtk.Label): + if 'href' in child.get_label(): + child.connect('activate-link', self._on_activate_link) + _find_child(child) + _find_child(parent) ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = cssutils>=1.0.2 keyring - nbxmpp>=0.6.8,<0.7.0 + nbxmpp>=0.6.9,<0.7.0 precis-i18n>=1.0.0 pyOpenSSL>=0.12 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3bd5843fc915479908613e2557a952d72… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3bd5843fc915479908613e2557a952d72… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Downgrade to Gtk 3.24.1
by Philipp Hörist 08 Jan '19

08 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: de25b57a by Philipp Hörist at 2019-01-08T21:09:06Z Windows: Downgrade to Gtk 3.24.1 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -69,13 +69,19 @@ function create_root { build_pacman --noconfirm -S base } +function download_install_dep () { + curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz \ + http://repo.msys2.org/mingw/"${ARCH}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz + build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz +} + function install_deps { # Downgrade GLIB, resolver is broken on Windows 7 - curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz \ - https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz - build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz + download_install_dep glib2-2.56.2-1 + # Downgrade Gtk, Gtk 24.2 has broken keyboard layout change + download_install_dep gtk3-3.24.1-1 - build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ + build_pacman --noconfirm -S mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de25b57ad8559edc3f794bd59222d82b2e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de25b57ad8559edc3f794bd59222d82b2e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-0.6.9
by Philipp Hörist 08 Jan '19

08 Jan '19

Philipp Hörist pushed new tag nbxmpp-0.6.9 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/tree/nbxmpp-0.6.9 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] Raise version to 0.6.9
by Philipp Hörist 08 Jan '19

08 Jan '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: 318406e6 by Philipp Hörist at 2019-01-08T19:29:10Z Raise version to 0.6.9 - - - - - 2 changed files: - nbxmpp/__init__.py - setup.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -17,4 +17,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.6.8" +__version__ = "0.6.9" ===================================== setup.py ===================================== @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.6.8', + version='0.6.9', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/318406e69081a22185f8e0531f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/318406e69081a22185f8e0531f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] Update ChangeLog
by Philipp Hörist 08 Jan '19

08 Jan '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: e292e593 by Philipp Hörist at 2019-01-08T19:03:11Z Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,8 @@ +python-nbxmpp 0.6.9 (10 January 2019) + + * Always bind after SM failed Fixes #64 + * Dont try and guess system language + python-nbxmpp 0.6.8 (07 October 2018) * Reset SM counter after receiving <enabled> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e292e5937c51362a75c0068520… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e292e5937c51362a75c0068520… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] 3 commits: Dont try to guess system language
by Philipp Hörist 08 Jan '19

08 Jan '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: a85b5376 by Philipp Hörist at 2019-01-08T18:23:49Z Dont try to guess system language getdefaultlocale() is not a good way for determining the users configured language Let the client figure it out and pass it to nbxmpp - - - - - 9f7a5212 by Philipp Hörist at 2019-01-08T18:59:00Z Always bind after sm resume fails - - - - - 82764c3a by Philipp Hörist at 2019-01-08T18:59:59Z Update .gitignore - - - - - 5 changed files: - .gitignore - nbxmpp/bosh.py - nbxmpp/client_nb.py - nbxmpp/dispatcher_nb.py - nbxmpp/smacks.py Changes: ===================================== .gitignore ===================================== @@ -1,2 +1,4 @@ build/ __pycache__/ +dist/ +nbxmpp.egg-info/ \ No newline at end of file ===================================== nbxmpp/bosh.py ===================================== @@ -44,10 +44,7 @@ class NonBlockingBOSH(NonBlockingTransport): idlequeue, estabilish_tls, certs, tls_version, cipher_list) self.bosh_sid = None - if locale.getdefaultlocale()[0]: - self.bosh_xml_lang = locale.getdefaultlocale()[0].split('_')[0] - else: - self.bosh_xml_lang = 'en' + self.bosh_xml_lang = self._owner.lang self.http_version = 'HTTP/1.1' self.http_persistent = True ===================================== nbxmpp/client_nb.py ===================================== @@ -37,7 +37,7 @@ class NonBlockingClient(object): handling, whereas underlying modules take care of feature-specific logic """ - def __init__(self, domain, idlequeue, caller=None): + def __init__(self, domain, idlequeue, caller=None, lang='en'): """ Caches connection data @@ -48,6 +48,7 @@ class NonBlockingClient(object): """ self.Namespace = protocol.NS_CLIENT self.defaultNamespace = self.Namespace + self.lang = lang self.idlequeue = idlequeue self.disconnect_handlers = [] ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -194,9 +194,7 @@ class XMPPDispatcher(PlugIn): self._metastream.setAttr('version', '1.0') self._metastream.setAttr('xmlns:stream', NS_STREAMS) self._metastream.setAttr('to', self._owner.Server) - if locale.getdefaultlocale()[0]: - self._metastream.setAttr('xml:lang', - locale.getdefaultlocale()[0].split('_')[0]) + self._metastream.setAttr('xml:lang', self._owner.lang) self._owner.send("%s%s>" % (XML_DECLARATION, str(self._metastream)[:-2])) def _check_stream_start(self, ns, tag, attrs): @@ -623,9 +621,7 @@ class BOSHDispatcher(XMPPDispatcher): self._metastream.setAttr('version', '1.0') self._metastream.setAttr('xmlns:stream', NS_STREAMS) self._metastream.setAttr('to', self._owner.Server) - if locale.getdefaultlocale()[0]: - self._metastream.setAttr('xml:lang', - locale.getdefaultlocale()[0].split('_')[0]) + self._metastream.setAttr('xml:lang', self._owner.lang) self.restart = True self._owner.Connection.send_init(after_SASL=self.after_SASL) ===================================== nbxmpp/smacks.py ===================================== @@ -184,43 +184,36 @@ class Smacks(object): self.old_uqueue = [] def error_handling(self, disp, stanza): - # If the server doesn't recognize previd, forget about resuming - # Ask for service discovery, etc.. - if stanza.getTag('item-not-found'): - self.resuming = False - self.enabled = False - # we need to bind a resource - self._owner.NonBlockingBind.resuming = False - self._owner.Dispatcher.Event(NS_STREAM_MGMT, 'RESUME FAILED', None) - self._owner._on_auth_bind(None) - self.failed_resume = True - - h = stanza.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, #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, #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, #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 - # 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'): - log.error('Gajim failed to negociate Stream Management') - self.enabled = False + # If the server doesn't recognize previd, forget about resuming + # Ask for service discovery, etc.. + self.resuming = False + self.enabled = False + # we need to bind a resource + self._owner.NonBlockingBind.resuming = False + self._owner.Dispatcher.Event(NS_STREAM_MGMT, 'RESUME FAILED', None) + self._owner._on_auth_bind(None) + self.failed_resume = True + + h = stanza.getAttr('h') + log.info('Session resumption failed, 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, #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, #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, #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) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3e4c66556bb830556b16ffae0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3e4c66556bb830556b16ffae0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new branch nbxmpp_0.6
by Philipp Hörist 08 Jan '19

08 Jan '19

Philipp Hörist pushed new branch nbxmpp_0.6 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/tree/nbxmpp_0.6 You're receiving this email because of your account on dev.gajim.org.

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