Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] 3 commits: Add namespace
by Philipp Hörist 19 Dec '18

19 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8ab51592 by Philipp Hörist at 2018-12-19T21:04:19Z Add namespace - - - - - 68e363f4 by Philipp Hörist at 2018-12-19T22:12:25Z Refactor dispatcher - Allow to attach priority to handlers on register - Dispatch stanzas sorted for priority - Remove/Simplify code - - - - - c51e9a85 by Philipp Hörist at 2018-12-19T22:13:51Z Raise version to 0.9.90.2 - - - - - 5 changed files: - nbxmpp/__init__.py - nbxmpp/dispatcher_nb.py - nbxmpp/protocol.py - nbxmpp/roster_nb.py - setup.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -15,4 +15,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.9.90.1" +__version__ = "0.9.90.2" ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -27,10 +27,18 @@ import uuid import logging from xml.parsers.expat import ExpatError -from . import simplexml -from .plugin import PlugIn -from .protocol import (NS_STREAMS, NS_HTTP_BIND, Iq, Presence, - Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED) +from nbxmpp.simplexml import NodeBuilder +from nbxmpp.plugin import PlugIn +from nbxmpp.protocol import NS_STREAMS +from nbxmpp.protocol import NS_HTTP_BIND +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Iq +from nbxmpp.protocol import Presence +from nbxmpp.protocol import Message +from nbxmpp.protocol import Protocol +from nbxmpp.protocol import Node +from nbxmpp.protocol import Error +from nbxmpp.protocol import ERR_FEATURE_NOT_IMPLEMENTED log = logging.getLogger('nbxmpp.dispatcher_nb') @@ -177,7 +185,7 @@ class XMPPDispatcher(PlugIn): Send an initial stream header """ self._owner.Connection.sendqueue = [] - self.Stream = simplexml.NodeBuilder() + self.Stream = NodeBuilder() self.Stream.dispatch = self.dispatch self.Stream._dispatch_depth = 2 self.Stream.stream_header_received = self._check_stream_start @@ -258,7 +266,7 @@ class XMPPDispatcher(PlugIn): self.RegisterProtocol('unknown', Protocol, xmlns=xmlns) self.RegisterProtocol('default', Protocol, xmlns=xmlns) - def RegisterProtocol(self, tag_name, Proto, xmlns=None, order='info'): + def RegisterProtocol(self, tag_name, proto, xmlns=None, order='info'): """ Used to declare some top-level stanza name to dispatcher @@ -266,20 +274,18 @@ class XMPPDispatcher(PlugIn): presence protocols are registered by default. """ if not xmlns: - xmlns=self._owner.defaultNamespace - log.debug('Registering protocol "%s" as %s(%s)' %(tag_name, Proto, xmlns)) - self.handlers[xmlns][tag_name] = {type:Proto, 'default':[]} + xmlns = self._owner.defaultNamespace + log.debug('Registering protocol "%s" as %s(%s)', tag_name, proto, xmlns) + self.handlers[xmlns][tag_name] = {'type': proto, 'default': []} - def RegisterNamespaceHandler(self, xmlns, handler, typ='', ns='', - makefirst=0, system=0): + def RegisterNamespaceHandler(self, xmlns, handler, typ='', ns='', system=0): """ Register handler for processing all stanzas for specified namespace """ - self.RegisterHandler('default', handler, typ, ns, xmlns, makefirst, - system) + self.RegisterHandler('default', handler, typ, ns, xmlns, system) def RegisterHandler(self, name, handler, typ='', ns='', xmlns=None, - makefirst=False, system=False): + system=False, priority=50): """ Register user callback as stanzas handler of declared type @@ -295,40 +301,44 @@ class XMPPDispatcher(PlugIn): value will match :param ns: namespace of child that stanza must contain. :param xmlns: xml namespace - :param makefirst: insert handler in the beginning of handlers list instead - of adding it to the end. Note that more common handlers i.e. w/o "typ" - and " will be called first nevertheless. :param system: call handler even if NodeProcessed Exception were raised - already. + already. + :param priority: The priority of the handler, higher get called later """ if not xmlns: - xmlns=self._owner.defaultNamespace - log.debug('Registering handler %s for "%s" type->%s ns->%s(%s)' % - (handler, name, typ, ns, xmlns)) + xmlns = self._owner.defaultNamespace + if not typ and not ns: - typ='default' + typ = 'default' + + log.debug( + 'Registering handler %s for "%s" type->%s ns->%s(%s) priority->%s', + handler, name, typ, ns, xmlns, priority) + if xmlns not in self.handlers: self.RegisterNamespace(xmlns, 'warn') if name not in self.handlers[xmlns]: self.RegisterProtocol(name, Protocol, xmlns, 'warn') - if typ+ns not in self.handlers[xmlns][name]: - self.handlers[xmlns][name][typ+ns]=[] - if makefirst: - self.handlers[xmlns][name][typ+ns].insert(0, {'func':handler, - 'system':system}) - else: - self.handlers[xmlns][name][typ+ns].append({'func':handler, - 'system':system}) + + specific = typ + ns + if specific not in self.handlers[xmlns][name]: + self.handlers[xmlns][name][specific] = [] + + self.handlers[xmlns][name][specific].append( + {'func': handler, + 'system': system, + 'priority': priority, + 'specific': specific}) def RegisterHandlerOnce(self, name, handler, typ='', ns='', xmlns=None, - makefirst=0, system=0): + system=0): """ Unregister handler after first call (not implemented yet) """ # FIXME Drop or implement if not xmlns: xmlns = self._owner.defaultNamespace - self.RegisterHandler(name, handler, typ, ns, xmlns, makefirst, system) + self.RegisterHandler(name, handler, typ, ns, xmlns, system) def UnregisterHandler(self, name, handler, typ='', ns='', xmlns=None): """ @@ -338,18 +348,26 @@ class XMPPDispatcher(PlugIn): if not xmlns: xmlns = self._owner.defaultNamespace if not typ and not ns: - typ='default' + typ = 'default' if xmlns not in self.handlers: return if name not in self.handlers[xmlns]: return - if typ+ns not in self.handlers[xmlns][name]: + + specific = typ + ns + if specific not in self.handlers[xmlns][name]: return - for pack in self.handlers[xmlns][name][typ+ns]: - if pack['func'] == handler: + for handler_dict in self.handlers[xmlns][name][specific]: + if handler_dict['func'] == handler: try: - self.handlers[xmlns][name][typ+ns].remove(pack) + self.handlers[xmlns][name][specific].remove(handler_dict) + log.debug( + 'Unregister handler %s for "%s" type->%s ns->%s(%s)', + handler, name, typ, ns, xmlns) except ValueError: + log.warning( + 'Unregister failed: %s for "%s" type->%s ns->%s(%s)', + handler, name, typ, ns, xmlns) pass def RegisterDefaultHandler(self, handler): @@ -401,16 +419,11 @@ class XMPPDispatcher(PlugIn): else: log.warning('Received unhandled event: %s' % event) - def dispatch(self, stanza, session=None, direct=0): + def dispatch(self, stanza, session=None): """ Main procedure that performs XMPP stanza recognition and calling apppropriate handlers for it. Called by simplexml """ - # FIXME: Where do we set session and direct. Why? What are those intended - # to do? - - #log.info('dispatch called: stanza = %s, session = %s, direct= %s' - # % (stanza, session, direct)) self.Event('', 'STANZA RECEIVED', stanza) @@ -428,8 +441,6 @@ class XMPPDispatcher(PlugIn): xmlns = stanza.getNamespace() - # log.info('in dispatch, getting ns for %s, and the ns is %s' - # % (stanza, xmlns)) if xmlns not in self.handlers: log.warning('Unknown namespace: %s', xmlns) xmlns = 'unknown' @@ -438,14 +449,13 @@ class XMPPDispatcher(PlugIn): if name not in ('features', 'stream'): log.warning('Unknown stanza: %s', stanza) else: - log.debug('Got %s/%s stanza' % (xmlns, name)) + log.debug('Got %s / %s stanza' % (xmlns, name)) name = 'unknown' else: - log.debug('Got %s/%s stanza' % (xmlns, name)) + log.debug('Got %s / %s stanza' % (xmlns, name)) - if stanza.__class__.__name__ == 'Node': - # FIXME: this cannot work - stanza = self.handlers[xmlns][name][type](node=stanza) + # Convert simplexml to Protocol object + stanza = self.handlers[xmlns][name]['type'](node=stanza) typ = stanza.getType() if name == 'message' and not typ: @@ -461,48 +471,55 @@ class XMPPDispatcher(PlugIn): if hasattr(self._owner, 'Smacks'): self._owner.Smacks.count_incoming(stanza.getName()) - list_ = ['default'] # we will use all handlers: - if typ in self.handlers[xmlns][name]: - list_.append(typ) # from very common... - for prop in stanza.props: - if prop in self.handlers[xmlns][name]: - list_.append(prop) - if typ and typ+prop in self.handlers[xmlns][name]: - list_.append(typ+prop) # ...to very particular - - chain = self.handlers[xmlns]['default']['default'] - for key in list_: - if key: - chain = chain + self.handlers[xmlns][name][key] - log.debug('Chain: %s', [key for key in list_ if key]) - + processed = False if ID in session._expected: - user = 0 if isinstance(session._expected[ID], tuple): cb, args = session._expected[ID] - log.debug("Expected stanza arrived. Callback %s(%s) found!" % - (cb, args)) + log.debug('Expected stanza arrived. Callback %s(%s) found', + cb, args) try: cb(session,stanza,**args) - except Exception as typ: - if typ.__class__.__name__ != 'NodeProcessed': - raise + except NodeProcessed: + pass + except Exception: + raise else: - log.debug("Expected stanza arrived!") + log.debug('Expected stanza arrived') session._expected[ID] = stanza - else: - user = 1 + processed = True + + # Gather specifics depending on stanza properties + specifics = ['default'] + if typ and typ in self.handlers[xmlns][name]: + specifics.append(typ) + for prop in stanza.props: + if prop in self.handlers[xmlns][name]: + specifics.append(prop) + if typ and typ + prop in self.handlers[xmlns][name]: + specifics.append(typ + prop) + + # Create the handler chain + chain = [] + chain += self.handlers[xmlns]['default']['default'] + for specific in specifics: + chain += self.handlers[xmlns][name][specific] + + # Sort chain with priority + chain.sort(key=lambda x: x['priority']) + for handler in chain: - if user or handler['system']: + if not processed or handler['system']: try: - log.debug('Call handler: %s', handler['func']) + log.info('Call handler: %s', handler['func'].__qualname__) handler['func'](session, stanza) - except Exception as typ: - if typ.__class__.__name__ != 'NodeProcessed': - self._pendingExceptions.insert(0, sys.exc_info()) - return - user=0 - if user and self._defaultHandler: + except NodeProcessed: + processed = True + except Exception: + self._pendingExceptions.insert(0, sys.exc_info()) + return + + # Stanza was not processed call default handler + if not processed and self._defaultHandler: self._defaultHandler(session, stanza) def _WaitForData(self, data): @@ -592,7 +609,7 @@ class BOSHDispatcher(XMPPDispatcher): """ Send an initial stream header """ - self.Stream = simplexml.NodeBuilder() + self.Stream = NodeBuilder() self.Stream.dispatch = self.dispatch self.Stream._dispatch_depth = 2 self.Stream.stream_header_received = self._check_stream_start @@ -625,7 +642,7 @@ class BOSHDispatcher(XMPPDispatcher): self.restart = False return XMPPDispatcher.ProcessNonBlocking(self, data) - def dispatch(self, stanza, session=None, direct=0): + def dispatch(self, stanza, session=None): if stanza.getName() == 'body' and stanza.getNamespace() == NS_HTTP_BIND: stanza_attrs = stanza.getAttrs() @@ -643,6 +660,6 @@ class BOSHDispatcher(XMPPDispatcher): # rewrite it to jabber:client if child.getNamespace() == NS_HTTP_BIND: child.setNamespace(self._owner.defaultNamespace) - XMPPDispatcher.dispatch(self, child, session, direct) + XMPPDispatcher.dispatch(self, child, session) else: - XMPPDispatcher.dispatch(self, stanza, session, direct) + XMPPDispatcher.dispatch(self, stanza, session) ===================================== nbxmpp/protocol.py ===================================== @@ -118,6 +118,7 @@ NS_MUC_ADMIN = NS_MUC + '#admin' NS_MUC_OWNER = NS_MUC + '#owner' NS_MUC_UNIQUE = NS_MUC + '#unique' NS_MUC_CONFIG = NS_MUC + '#roomconfig' +NS_MUC_REQUEST = NS_MUC + '#request' NS_NICK = 'http://jabber.org/protocol/nick' # XEP-0172 NS_OFFLINE = 'http://www.jabber.org/jeps/jep-0030.html' # XEP-0013 NS_OMEMO = 'urn:xmpp:omemo:0' # XEP-0384 ===================================== nbxmpp/roster_nb.py ===================================== @@ -331,7 +331,7 @@ class NonBlockingRoster(PlugIn): Also request roster from server if the 'request' argument is set. Used internally """ - self._owner.RegisterHandler('iq', self.RosterIqHandler, 'result', NS_ROSTER, makefirst = 1) + self._owner.RegisterHandler('iq', self.RosterIqHandler, 'result', NS_ROSTER) self._owner.RegisterHandler('iq', self.RosterIqHandler, 'set', NS_ROSTER) self._owner.RegisterHandler('presence', self.PresenceHandler) if request: ===================================== setup.py ===================================== @@ -3,7 +3,7 @@ from setuptools import setup setup(name='nbxmpp', - version='0.9.90.1', + version='0.9.90.2', 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/compare/730a1520220270f68cb38f17e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/730a1520220270f68cb38f17e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Allow registering handlers for type normal
by Philipp Hörist 19 Dec '18

19 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 730a1520 by Philipp Hörist at 2018-12-19T14:37:55Z Allow registering handlers for type normal - - - - - 1 changed file: - nbxmpp/dispatcher_nb.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -448,7 +448,9 @@ class XMPPDispatcher(PlugIn): stanza = self.handlers[xmlns][name][type](node=stanza) typ = stanza.getType() - if not typ: + if name == 'message' and not typ: + typ = 'normal' + elif not typ: typ = '' stanza.props = stanza.getProperties() ID = stanza.getID() @@ -472,6 +474,7 @@ class XMPPDispatcher(PlugIn): for key in list_: if key: chain = chain + self.handlers[xmlns][name][key] + log.debug('Chain: %s', [key for key in list_ if key]) if ID in session._expected: user = 0 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/730a1520220270f68cb38f17e4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/730a1520220270f68cb38f17e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Update status conditions to new namespace
by Philipp Hörist 19 Dec '18

19 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d4e70c27 by Philipp Hörist at 2018-12-19T06:41:22Z Update status conditions to new namespace - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -57,7 +57,7 @@ NS_CHATMARKERS = 'urn:xmpp:chat-markers:0' # XEP-0333 NS_CHATSTATES = 'http://jabber.org/protocol/chatstates' # XEP-0085 NS_CHATTING = 'http://jabber.org/protocol/chatting' # XEP-0194 NS_CLIENT = 'jabber:client' -NS_CONDITIONS = 'urn:xmpp:muc:conditions:0' # XEP-0306 +NS_CONDITIONS = 'urn:xmpp:muc:conditions:1' # XEP-0306 NS_COMMANDS = 'http://jabber.org/protocol/commands' NS_COMPONENT_ACCEPT = 'jabber:component:accept' NS_COMPONENT_1 = 'http://jabberd.jabberstudio.org/ns/component/1.0' @@ -473,6 +473,28 @@ _errorcodes = { 'cancel': 'invalid-from' } +_status_conditions = { + 'realjid-public': 100, + 'affiliation-changed': 101, + 'unavailable-shown': 102, + 'unavailable-not-shown': 103, + 'configuration-changed': 104, + 'self-presence': 110, + 'logging-enabled': 170, + 'logging-disabled': 171, + 'non-anonymous': 172, + 'semi-anonymous': 173, + 'fully-anonymous': 174, + 'room-created': 201, + 'nick-assigned': 210, + 'banned': 301, + 'new-nick': 303, + 'kicked': 307, + 'removed-affiliation': 321, + 'removed-membership': 322, + 'removed-shutdown': 332, +} + STREAM_NOT_AUTHORIZED = 'urn:ietf:params:xml:ns:xmpp-streams not-authorized' STREAM_REMOTE_CONNECTION_FAILED = 'urn:ietf:params:xml:ns:xmpp-streams remote-connection-failed' SASL_MECHANISM_TOO_WEAK = 'urn:ietf:params:xml:ns:xmpp-sasl mechanism-too-weak' @@ -939,16 +961,21 @@ class Protocol(Node): """ return self.getTagAttr('error', 'code') - def getStatusConditions(self): + def getStatusConditions(self, as_code=False): """ Return the status conditions list as defined in XEP-0306. """ - conds = [] - condtag = self.getTag('conditions', namespace=NS_CONDITIONS) - if condtag: - for tag in condtag.getChildren(): - conds.append(tag.getName()) - return conds + result = set() + status_tags = self.getTags('status') + for status in status_tags: + if as_code: + code = status.getAttr('code') + if code is not None: + result.add(code) + else: + for condition in status.getChildren(): + result.add(condition.getName()) + return list(result) def setError(self, error, code=None): """ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d4e70c27f3af2ac761e650ec53… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d4e70c27f3af2ac761e650ec53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 11 commits: Fix disabled join groupchat menu
by Philipp Hörist 18 Dec '18

18 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: efcb6235 by Philipp Hörist at 2018-12-18T14:02:37Z Fix disabled join groupchat menu When there are no bookmarks on the server the join groupchat menu was disabled, preventing the user to open the join groupchat dialog - - - - - c25e3756 by Philipp Hörist at 2018-12-18T14:02:57Z Fix start chat menu action Fixes #8275 - - - - - c2f2ba97 by Philipp Hörist at 2018-12-18T14:03:07Z Dont draw contact after selection change This seems to be an old codepath, currently there is no need to redraw a contact on selection change Fixes #9496 - - - - - e9068f08 by Philipp Hörist at 2018-12-18T14:05:05Z DBus: Show correct unread message number Fixes #8362 - - - - - 9eed0338 by Philipp Hörist at 2018-12-18T14:13:08Z Fix error on key press Fixes #9471 - - - - - 50435ba8 by Philipp Hörist at 2018-12-18T14:14:57Z Make copying text work with different layouts This makes it possible so text can be copied from the conversation textview with other keyboard layouts than english - - - - - ac9bec3e by Philipp Hörist at 2018-12-18T14:15:32Z Fix error when opening sign-in/out notification - - - - - d7bc9270 by Philipp Hörist at 2018-12-18T14:15:33Z Allow handlers list to be modifed while iterating - - - - - 0f340547 by Philipp Hörist at 2018-12-18T14:15:33Z Roster: Register our-show with lower priority This event is used to shutdown the roster if we quit, it destroys all windows. This should be run last because other objects like the ChatControl need a reference to the window to shutdown properly - - - - - a5e6f434 by Philipp Hörist at 2018-12-18T14:36:03Z MUC: Fix invisible event icon on private message - - - - - 436eb2df by Philipp Hörist at 2018-12-18T14:43:32Z Update ChangeLog - - - - - 9 changed files: - ChangeLog - gajim/chat_control_base.py - gajim/common/ged.py - gajim/groupchat_control.py - gajim/gtk/util.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== ChangeLog ===================================== @@ -1,15 +1,18 @@ -Gajim 1.1.1 (10 December 2018) +Gajim 1.1.1 (19 December 2018) Bug fixes + * 8362 DBus: Incorrect unread message count * 9427 Placeholder not cleared if pasting text into message input * 9444 Determine the delay timestamp correctly when using mam:1 * 9453 Fix opening links inside the group chat subject (MacOS/Windows) * 9465 Allow the full range of possible nicknames in group chats * 9067 Gajim crashes when receiving xhtml messages + * 9471 Conversation Textview: Error on key press * 9472 Handle presences without from attr correctly * 9473 Error when creating a new group chat * 9491 Identify group chat subject changes correctly + * 9496 Error on MUC roster selection change * Determine soundplayer correctly on unix systems * In some circumstances plugins could not be deleted * Show correct contact status on tabs @@ -18,6 +21,10 @@ Gajim 1.1.1 (10 December 2018) * Pressing the back button in the Accounts window leads to an error * Better handle not available keyring backends * Dont show incorrect contact on private messages + * Join group chat menu is disabled when there are no bookmarks + * Error on start chat menu action + * Error when opening sign-in/out notification + * Copying text does not work with different keyboard layouts Gajim 1.1.0 (06 November 2018) ===================================== gajim/chat_control_base.py ===================================== @@ -54,6 +54,9 @@ from gajim.message_textview import MessageTextView from gajim.gtk.dialogs import NonModalConfirmationDialog from gajim.gtk.util import convert_rgb_to_hex +from gajim.gtk.util import get_primary_accel_mod +from gajim.gtk.util import get_hardware_key_codes + from gajim.gtk.emoji_chooser import emoji_chooser from gajim.command_system.implementation.middleware import ChatCommandProcessor @@ -78,23 +81,12 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): A base class containing a banner, ConversationTextview, MessageTextView """ - keymap = Gdk.Keymap.get_for_display(Gdk.Display.get_default()) - try: - keycode_c = keymap.get_entries_for_keyval(Gdk.KEY_c)[1][0].keycode - except TypeError: - keycode_c = 54 - except IndexError: - # FIXME - # On some keyboard layouts there is no keyval for KEY_c - keycode_c = None - - try: - keycode_ins = keymap.get_entries_for_keyval(Gdk.KEY_Insert)[1][0].keycode - except TypeError: - keycode_ins = 118 - except IndexError: - # There is no KEY_Insert (MacOS) - keycode_ins = None + # This is needed so copying text from the conversation textview + # works with different language layouts. Pressing the key c on a russian + # layout yields another keyval than with the english layout. + # So we match hardware keycodes instead of keyvals. + # Multiple hardware keycodes can trigger a keyval like Gdk.KEY_c. + keycodes_c = get_hardware_key_codes(Gdk.KEY_c) def make_href(self, match): url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) @@ -584,20 +576,18 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if event.button == 3: # right click self.parent_win.popup_menu(event) - def _conv_textview_key_press_event(self, widget, event): - # translate any layout to latin_layout - _valid, entries = self.keymap.get_entries_for_keyval(event.keyval) - keycode = entries[0].keycode - if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and keycode in ( - self.keycode_c, self.keycode_ins)): - return False + def _conv_textview_key_press_event(self, _widget, event): + if (event.get_state() & get_primary_accel_mod() and + event.hardware_keycode in self.keycodes_c): + return Gdk.EVENT_PROPAGATE - if event.get_state() & Gdk.ModifierType.SHIFT_MASK and \ - event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): + if (event.get_state() & Gdk.ModifierType.SHIFT_MASK and + event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up)): self._on_scroll(None, event.keyval) - return False + return Gdk.EVENT_PROPAGATE + self.parent_win.notebook.event(event) - return True + return Gdk.EVENT_STOP def _on_message_textview_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_space: ===================================== gajim/common/ged.py ===================================== @@ -87,7 +87,9 @@ class GlobalEventsDispatcher: log.debug('%s Args: %s', event_name, str(args)) if event_name in self.handlers: node_processed = False - for _priority, handler in self.handlers[event_name]: + # Iterate over a copy of the handlers list, so while iterating + # the original handlers list can be modified + for _priority, handler in list(self.handlers[event_name]): try: if handler(*args, **kwargs): return True ===================================== gajim/groupchat_control.py ===================================== @@ -366,8 +366,6 @@ class GroupchatControl(ChatControlBase): self.widget_set_visible(self.xml.get_object('banner_eventbox'), app.config.get('hide_groupchat_banner')) - self._last_selected_contact = None # None or holds jid, account tuple - # muc attention flag (when we are mentioned in a muc) # if True, the room has mentioned us self.attention_flag = False @@ -389,12 +387,8 @@ class GroupchatControl(ChatControlBase): self.event_box = self.xml.get_object('banner_eventbox') self.list_treeview = self.xml.get_object('list_treeview') - selection = self.list_treeview.get_selection() - id_ = selection.connect('changed', - self.on_list_treeview_selection_changed) - self.handlers[id_] = selection id_ = self.list_treeview.connect('style-set', - self.on_list_treeview_style_set) + self.on_list_treeview_style_set) self.handlers[id_] = self.list_treeview # flag that stops hpaned position event @@ -1038,21 +1032,6 @@ class GroupchatControl(ChatControlBase): nick = contact[Column.NICK] self.draw_contact(nick) - def on_list_treeview_selection_changed(self, selection): - model, selected_iter = selection.get_selected() - self.draw_contact(self.nick) - if self._last_selected_contact is not None: - self.draw_contact(self._last_selected_contact) - if selected_iter is None: - self._last_selected_contact = None - return - contact = model[selected_iter] - nick = contact[Column.NICK] - self._last_selected_contact = nick - if contact[Column.TYPE] != 'contact': - return - self.draw_contact(nick, selected=True, focus=True) - def get_tab_label(self, chatstate): """ Markup the label if necessary. Returns a tuple such as: (new_label_str, @@ -1318,10 +1297,10 @@ class GroupchatControl(ChatControlBase): if not autopopup or (not autopopupaway and \ app.connections[self.account].connected > 2): if no_queue: # We didn't have a queue: we change icons - state_images = \ - app.interface.roster.get_appropriate_state_images( - self.room_jid, icon_name='event') - image = state_images['event'] + icon_name = gtkgui_helpers.get_iconset_name_for('event') + surface = Gtk.IconTheme.get_default().load_surface( + icon_name, 16, self.scale_factor, None, 0) + image = Gtk.Image.new_from_surface(surface) self.model[iter_][Column.IMG] = image if self.parent_win: self.parent_win.show_title() @@ -1755,7 +1734,7 @@ class GroupchatControl(ChatControlBase): if ctrl and msg: ctrl.send_message(msg) - def draw_contact(self, nick, selected=False, focus=False): + def draw_contact(self, nick): iter_ = self.get_contact_iter(nick) if not iter_: return ===================================== gajim/gtk/util.py ===================================== @@ -247,3 +247,20 @@ def convert_rgb_to_hex(rgb_string: str) -> str: green = int(rgb.green * 255) blue = int(rgb.blue * 255) return '#%02x%02x%02x' % (red, green, blue) + + +def get_primary_accel_mod(): + """ + Returns the primary Gdk.ModifierType modifier. + cmd on osx, ctrl everywhere else. + """ + return Gtk.accelerator_parse("<Primary>")[1] + + +def get_hardware_key_codes(keyval): + keymap = Gdk.Keymap.get_for_display(Gdk.Display.get_default()) + + valid, key_map_keys = keymap.get_entries_for_keyval(keyval) + if not valid: + return [] + return [key.keycode for key in key_map_keys] ===================================== gajim/gui_interface.py ===================================== @@ -1647,9 +1647,10 @@ class Interface: fjid = jid contact = None if resource: - contact = app.contacts.get_contact(account, jid, resource) - if not contact: - contact = highest_contact + contact = app.contacts.get_contact(account, jid, resource) or highest_contact + if contact is None: + # Maybe we deleted the contact from the roster + return ctrl = self.new_chat(contact, account, resource=resource) ===================================== gajim/gui_menu_builder.py ===================================== @@ -686,10 +686,8 @@ def get_groupchat_menu(control_id): def get_bookmarks_menu(account, rebuild=False): con = app.connections[account] - boomarks = con.get_module('Bookmarks').get_sorted_bookmarks( - short_name=True) - if not boomarks: - return None + boomarks = con.get_module('Bookmarks').get_sorted_bookmarks(short_name=True) + menu = Gio.Menu() # Build Join Groupchat @@ -907,19 +905,13 @@ def get_conv_context_menu(account, kind, text): menuitem.set_label(label) if action.startswith('-'): + text = text.replace('xmpp:', '') + text = text.split('?')[0] action = 'app.%s%s' % (account, action) else: action = 'app.%s' % action menuitem.set_action_name(action) - if 'join-groupchat' in action: - text = text.replace('xmpp:', '') - text = text.split('?')[0] - - if 'add-contact' in action: - text = text.replace('xmpp:', '') - text = text.split('?')[0] - if action == 'app.open-link': value = GLib.Variant.new_strv([kind, text]) elif action == 'app.copy-link': ===================================== gajim/remote_control.py ===================================== @@ -901,7 +901,11 @@ class GajimRemote(Server): return contact_dict def get_unread_msgs_number(self): - return str(app.events.get_nb_events()) + unread = app.events.get_nb_events() + for event in app.events.get_all_events(['printed_gc_msg']): + if not app.config.notify_for_muc(event.jid): + unread -= 1 + return str(unread) def start_chat(self, account): if not account: ===================================== gajim/roster_window.py ===================================== @@ -5908,7 +5908,7 @@ class RosterWindow: self._nec_roster_received) app.ged.register_event_handler('anonymous-auth', ged.GUI1, self._nec_anonymous_auth) - app.ged.register_event_handler('our-show', ged.GUI1, + app.ged.register_event_handler('our-show', ged.GUI2, self._nec_our_show) app.ged.register_event_handler('connection-type', ged.GUI1, self._nec_connection_type) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c90339383c5276df677407e63af3dbad0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c90339383c5276df677407e63af3dbad0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Roster: Register our-show with lower priority
by Philipp Hörist 18 Dec '18

18 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 89d99409 by Philipp Hörist at 2018-12-18T13:40:38Z Roster: Register our-show with lower priority This event is used to shutdown the roster if we quit, it destroys all windows. This should be run last because other objects like the ChatControl need a reference to the window to shutdown properly - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -5872,7 +5872,7 @@ class RosterWindow: self._nec_roster_received) app.ged.register_event_handler('anonymous-auth', ged.GUI1, self._nec_anonymous_auth) - app.ged.register_event_handler('our-show', ged.GUI1, + app.ged.register_event_handler('our-show', ged.GUI2, self._nec_our_show) app.ged.register_event_handler('connection-type', ged.GUI1, self._nec_connection_type) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/89d994093393d3ec010facfab6b3fc4802… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/89d994093393d3ec010facfab6b3fc4802… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Allow handlers list to be modifed while iterating
by Philipp Hörist 18 Dec '18

18 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ac52a39 by Philipp Hörist at 2018-12-18T13:08:27Z Allow handlers list to be modifed while iterating - - - - - 1 changed file: - gajim/common/ged.py Changes: ===================================== gajim/common/ged.py ===================================== @@ -87,7 +87,9 @@ class GlobalEventsDispatcher: log.debug('%s Args: %s', event_name, str(args)) if event_name in self.handlers: node_processed = False - for _priority, handler in self.handlers[event_name]: + # Iterate over a copy of the handlers list, so while iterating + # the original handlers list can be modified + for _priority, handler in list(self.handlers[event_name]): try: if handler(*args, **kwargs): return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0ac52a390ef0250aa3e119ab97b350675b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0ac52a390ef0250aa3e119ab97b350675b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Make copying text work with different layouts
by Philipp Hörist 17 Dec '18

17 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b4495676 by Philipp Hörist at 2018-12-17T13:49:50Z Make copying text work with different layouts This makes it possible so text can be copied from the conversation textview with other keyboard layouts than english - - - - - a6b8ecf6 by Philipp Hörist at 2018-12-17T14:02:40Z Fix error when opening sign-in/out notification - - - - - 3 changed files: - gajim/chat_control_base.py - gajim/gtk/util.py - gajim/gui_interface.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -58,6 +58,7 @@ from gajim.gtk.util import at_the_end from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray from gajim.gtk.util import get_primary_accel_mod +from gajim.gtk.util import get_hardware_key_codes from gajim.gtk.emoji_chooser import emoji_chooser from gajim.command_system.implementation.middleware import ChatCommandProcessor @@ -82,6 +83,13 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): A base class containing a banner, ConversationTextview, MessageTextView """ + # This is needed so copying text from the conversation textview + # works with different language layouts. Pressing the key c on a russian + # layout yields another keyval than with the english layout. + # So we match hardware keycodes instead of keyvals. + # Multiple hardware keycodes can trigger a keyval like Gdk.KEY_c. + keycodes_c = get_hardware_key_codes(Gdk.KEY_c) + def make_href(self, match): url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) color = convert_rgb_to_hex(url_color) @@ -552,7 +560,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def _conv_textview_key_press_event(self, _widget, event): if (event.get_state() & get_primary_accel_mod() and - event.keyval in (Gdk.KEY_c, Gdk.KEY_Insert)): + event.hardware_keycode in self.keycodes_c): return Gdk.EVENT_PROPAGATE if (event.get_state() & Gdk.ModifierType.SHIFT_MASK and ===================================== gajim/gtk/util.py ===================================== @@ -480,3 +480,12 @@ def get_primary_accel_mod(): cmd on osx, ctrl everywhere else. """ return Gtk.accelerator_parse("<Primary>")[1] + + +def get_hardware_key_codes(keyval): + keymap = Gdk.Keymap.get_for_display(Gdk.Display.get_default()) + + valid, key_map_keys = keymap.get_entries_for_keyval(keyval) + if not valid: + return [] + return [key.keycode for key in key_map_keys] ===================================== gajim/gui_interface.py ===================================== @@ -1572,9 +1572,10 @@ class Interface: fjid = jid contact = None if resource: - contact = app.contacts.get_contact(account, jid, resource) - if not contact: - contact = highest_contact + contact = app.contacts.get_contact(account, jid, resource) or highest_contact + if contact is None: + # Maybe we deleted the contact from the roster + return ctrl = self.new_chat(contact, account, resource=resource) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/841f12f75b80eb9729d7bcfd2a424baac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/841f12f75b80eb9729d7bcfd2a424baac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Dont try to send if we are disconnected
by Philipp Hörist 17 Dec '18

17 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: a3e8096f by Philipp Hörist at 2018-12-17T11:55:11Z Dont try to send if we are disconnected Attempt to fix endless loop, Fixes #63 - - - - - 1 changed file: - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/transports_nb.py ===================================== @@ -462,7 +462,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): self._connect_to_proxy() else: self._on_connect() - else: + elif self.get_state() != DISCONNECTED: self._do_send() def pollend(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/a3e8096faf6afec575de15bcca… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/a3e8096faf6afec575de15bcca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Change some log messages
by Philipp Hörist 17 Dec '18

17 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c3304705 by Philipp Hörist at 2018-12-17T11:25:50Z Change some log messages - - - - - 7303238a by Philipp Hörist at 2018-12-17T11:26:42Z Raise version to 0.9.90.1 - - - - - 4 changed files: - nbxmpp/__init__.py - nbxmpp/bind.py - nbxmpp/smacks.py - setup.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -15,4 +15,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.9.90" +__version__ = "0.9.90.1" ===================================== nbxmpp/bind.py ===================================== @@ -79,6 +79,7 @@ class NonBlockingBind(PlugIn): """ Perform binding. Use provided resource name or random (if not provided). """ + log.info('Send bind') resource = [] if self._owner._Resource: resource = [Node('resource', payload=[self._owner._Resource])] ===================================== nbxmpp/smacks.py ===================================== @@ -260,10 +260,10 @@ class Smacks(PlugIn): This can be called after 'enable' and 'resume' ''' - log.error('StreamManagement negotiation failed') + log.info('Stream Management negotiation failed') error_text = stanza.getTagData('text') if error_text is not None: - log.error(error_text) + log.info(error_text) if stanza.getTag('item-not-found') is not None: log.info('Session timed out, last server h: %s', @@ -272,7 +272,7 @@ class Smacks(PlugIn): else: for tag in stanza.getTags(): if tag.getName() != 'text': - log.error(tag.getName()) + log.info(tag.getName()) if self.resume_in_progress: self._owner.Dispatcher.Event(Realm.CONNECTING, Event.RESUME_FAILED) ===================================== setup.py ===================================== @@ -3,7 +3,7 @@ from setuptools import setup setup(name='nbxmpp', - version='0.9.90', + version='0.9.90.1', 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/compare/7f39ed31591c7d0eea66259d4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/7f39ed31591c7d0eea66259d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix mypy errors
by Philipp Hörist 16 Dec '18

16 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 841f12f7 by Philipp Hörist at 2018-12-16T23:41:46Z Fix mypy errors - - - - - 2 changed files: - gajim/common/const.py - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/const.py ===================================== @@ -156,12 +156,6 @@ class RequestAvatar(IntEnum): USER = 2 -@unique -class BookmarkStorageType(IntEnum): - PRIVATE = 0 - PUBSUB = 1 - - @unique class PEPEventType(IntEnum): ABSTRACT = 0 ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -15,6 +15,7 @@ # XEP-0048: Bookmarks from typing import Any +from typing import Dict from typing import List from typing import Optional @@ -27,7 +28,6 @@ from gi.repository import GLib from gajim.common import app from gajim.common import helpers -from gajim.common.const import BookmarkStorageType from gajim.common.const import PEPEventType from gajim.common.nec import NetworkEvent from gajim.common.exceptions import StanzaMalformed @@ -210,7 +210,7 @@ class Bookmarks(AbstractPEPModule): return storage @staticmethod - def _parse_bookmarks(storage: nbxmpp.Node) -> bool: + def _parse_bookmarks(storage: nbxmpp.Node) -> Dict[str, Dict[str, Any]]: bookmarks = {} confs = storage.getTags('conference') for conf in confs: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/841f12f75b80eb9729d7bcfd2a424baacb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/841f12f75b80eb9729d7bcfd2a424baacb… 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