Commits December 2018

commits@gajim.org

1 participants
81 discussions

[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

[Git][gajim/gajim][master] Handle PEP bookmarks notifications
by Philipp Hörist 16 Dec '18

16 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 96edd799 by Philipp Hörist at 2018-12-16T23:36:45Z Handle PEP bookmarks notifications - Handle PEP bookmark notifications - On new bookmarks with the auto join flag set, join the MUC - Dont merge private and pubsub bookmarks - Only use pubsub if the conversion feature is announced - - - - - 3 changed files: - gajim/common/app.py - gajim/common/const.py - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/app.py ===================================== @@ -159,7 +159,7 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE, nbxmpp.NS_CORRECT, - nbxmpp.NS_EME, 'urn:xmpp:avatar:metadata+notify'] + nbxmpp.NS_EME, 'urn:xmpp:avatar:metadata+notify', 'storage:bookmarks+notify'] # Optional features gajim supports per account gajim_optional_features = {} # type: Dict[str, List[str]] ===================================== gajim/common/const.py ===================================== @@ -172,6 +172,7 @@ class PEPEventType(IntEnum): NICKNAME = 5 AVATAR = 6 ATOM = 7 + BOOKMARKS = 8 @unique ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -14,32 +14,54 @@ # XEP-0048: Bookmarks +from typing import Any +from typing import List +from typing import Optional + import logging import copy from collections import OrderedDict import nbxmpp +from gi.repository import GLib from gajim.common import app from gajim.common import helpers from gajim.common.const import BookmarkStorageType -from gajim.common.nec import NetworkIncomingEvent +from gajim.common.const import PEPEventType +from gajim.common.nec import NetworkEvent +from gajim.common.exceptions import StanzaMalformed +from gajim.common.modules.pep import AbstractPEPModule +from gajim.common.modules.pep import AbstractPEPData from gajim.common.modules.util import from_xs_boolean from gajim.common.modules.util import to_xs_boolean + log = logging.getLogger('gajim.c.m.bookmarks') NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' -class Bookmarks: +class BookmarksData(AbstractPEPData): + + type_ = PEPEventType.BOOKMARKS + + +class Bookmarks(AbstractPEPModule): + + name = 'storage' + namespace = 'storage:bookmarks' + pep_class = BookmarksData + store_publish = False + _log = log + def __init__(self, con): - self._con = con - self._account = con.name + AbstractPEPModule.__init__(self, con) + self.bookmarks = {} self.conversion = False - - self.handlers = [] + self._join_timeouts = [] + self._request_in_progress = False def pass_disco(self, from_, _identities, features, _data, _node): if nbxmpp.NS_BOOKMARK_CONVERSION not in features: @@ -47,6 +69,52 @@ class Bookmarks: self.conversion = True log.info('Discovered Bookmarks Conversion: %s', from_) + def _extract_info(self, item): + storage = item.getTag('storage', namespace=self.namespace) + if storage is None: + raise StanzaMalformed('No storage node') + return storage + + def _notification_received(self, jid: nbxmpp.JID, user_pep: Any) -> None: + if self._request_in_progress: + log.info('Ignore update, pubsub request in progress') + return + + if not self._pubsub_support() or not self.conversion: + return + + old_bookmarks = self._convert_to_set(self.bookmarks) + self.bookmarks = self._parse_bookmarks(user_pep.data) + self._act_on_changed_bookmarks(old_bookmarks) + app.nec.push_incoming_event( + NetworkEvent('bookmarks-received', account=self._account)) + + def _act_on_changed_bookmarks(self, old_bookmarks): + new_bookmarks = self._convert_to_set(self.bookmarks) + changed = new_bookmarks - old_bookmarks + if not changed: + return + + join = [jid for jid, autojoin in changed if autojoin] + for jid in join: + log.info('Schedule autojoin in 10s for: %s', jid) + # If another client creates a MUC, the MUC is locked until the + # configuration is finished. Give the user some time to finish + # the configuration. + timeout_id = GLib.timeout_add_seconds( + 10, self._join_with_timeout, join) + self._join_timeouts.append(timeout_id) + + # TODO: leave mucs + # leave = [jid for jid, autojoin in changed if not autojoin] + + @staticmethod + def _convert_to_set(bookmarks): + set_ = set() + for jid in bookmarks: + set_.add((jid, bookmarks[jid]['autojoin'])) + return set_ + def get_sorted_bookmarks(self, short_name=False): # This returns a sorted by name copy of the bookmarks sorted_bookmarks = {} @@ -72,65 +140,43 @@ class Bookmarks: return (self._con.get_module('PEP').supported and self._con.get_module('PubSub').publish_options) - def get_bookmarks(self, storage_type=None): + def get_bookmarks(self): if not app.account_is_connected(self._account): return - if storage_type in (None, BookmarkStorageType.PUBSUB): - if self._pubsub_support(): - self._request_pubsub_bookmarks() - else: - # Fallback, request private storage - self._request_private_bookmarks() + if self._pubsub_support() and self.conversion: + self._request_pubsub_bookmarks() else: - log.info('Request Bookmarks (PrivateStorage)') self._request_private_bookmarks() def _request_pubsub_bookmarks(self) -> None: log.info('Request Bookmarks (PubSub)') + self._request_in_progress = True self._con.get_module('PubSub').send_pb_retrieve( - '', 'storage:bookmarks', - cb=self._pubsub_bookmarks_received) - - def _pubsub_bookmarks_received(self, _con, stanza): - if not nbxmpp.isResultNode(stanza): - log.info('No pubsub bookmarks: %s', stanza.getError()) - # Fallback, request private storage, only if server - # doesnt have bookmark conversion - if not self.conversion: - self._request_private_bookmarks() - return - - log.info('Received Bookmarks (PubSub)') - self._parse_bookmarks(stanza) - if not self.conversion: - # If server does not have bookmark conversion, request private - # storage and try to merge the bookmarks - self._request_private_bookmarks() + '', 'storage:bookmarks', cb=self._bookmarks_received) def _request_private_bookmarks(self) -> None: - if not app.account_is_connected(self._account): - return - + self._request_in_progress = True iq = nbxmpp.Iq(typ='get') query = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) query.addChild(name='storage', namespace='storage:bookmarks') log.info('Request Bookmarks (PrivateStorage)') self._con.connection.SendAndCallForResponse( - iq, self._private_bookmarks_received) + iq, self._bookmarks_received, {}) - def _private_bookmarks_received(self, stanza: nbxmpp.Iq) -> None: + def _bookmarks_received(self, _con, stanza): + self._request_in_progress = False if not nbxmpp.isResultNode(stanza): - log.info('No private bookmarks: %s', stanza.getError()) + log.info('No bookmarks found: %s', stanza.getError()) else: - log.info('Received Bookmarks (PrivateStorage)') - merged = self._parse_bookmarks(stanza, check_merge=True) - if merged and self._pubsub_support(): - log.info('Merge PrivateStorage with PubSub') - self.store_bookmarks(BookmarkStorageType.PUBSUB) - self.auto_join_bookmarks() - app.nec.push_incoming_event(BookmarksReceivedEvent( - None, account=self._account)) + log.info('Received Bookmarks') + storage = self._get_storage_node(stanza) + if storage is not None: + self.bookmarks = self._parse_bookmarks(storage) + self.auto_join_bookmarks() + + app.nec.push_incoming_event( + NetworkEvent('bookmarks-received', account=self._account)) @staticmethod def _get_storage_node(stanza): @@ -163,13 +209,9 @@ class Bookmarks: return return storage - def _parse_bookmarks(self, stanza: nbxmpp.Iq, - check_merge: bool = False) -> bool: - merged = False - storage = self._get_storage_node(stanza) - if storage is None: - return False - + @staticmethod + def _parse_bookmarks(storage: nbxmpp.Node) -> bool: + bookmarks = {} confs = storage.getTags('conference') for conf in confs: autojoin_val = conf.getAttr('autojoin') @@ -177,18 +219,14 @@ class Bookmarks: autojoin_val = False minimize_val = conf.getTag('minimize', namespace=NS_GAJIM_BM) - if not minimize_val: # not there, try old Gajim behaviour - minimize_val = conf.getAttr('minimize') - if not minimize_val: # not there (it's optional) - minimize_val = False + if not minimize_val: + minimize_val = False else: minimize_val = minimize_val.getData() print_status = conf.getTag('print_status', namespace=NS_GAJIM_BM) if not print_status: # not there, try old Gajim behaviour - print_status = conf.getTagData('print_status') - if not print_status: # not there, try old Gajim behaviour - print_status = conf.getTagData('show_status') + print_status = None else: print_status = print_status.getData() @@ -213,20 +251,16 @@ class Bookmarks: log.warning(error) continue - if check_merge: - if jid in self.bookmarks: - continue - merged = True - log.debug('Found Bookmark: %s', jid) - self.bookmarks[jid] = bookmark + bookmarks[jid] = bookmark - return merged + return bookmarks - def _build_storage_node(self) -> nbxmpp.Node: + @staticmethod + def _build_storage_node(bookmarks): storage_node = nbxmpp.Node( tag='storage', attrs={'xmlns': 'storage:bookmarks'}) - for jid, bm in self.bookmarks.items(): + for jid, bm in bookmarks.items(): conf_node = storage_node.addChild(name="conference") conf_node.setAttr('jid', jid) conf_node.setAttr('autojoin', to_xs_boolean(bm['autojoin'])) @@ -246,6 +280,9 @@ class Bookmarks: namespace=NS_GAJIM_BM).setData(bm['print_status']) return storage_node + def _build_node(self, _data): + pass + @staticmethod def get_bookmark_publish_options() -> nbxmpp.Node: options = nbxmpp.Node(nbxmpp.NS_DATA + ' x', @@ -257,23 +294,14 @@ class Bookmarks: field.setTagData('value', 'whitelist') return options - def store_bookmarks(self, storage_type=None): + def store_bookmarks(self): if not app.account_is_connected(self._account): return - storage_node = self._build_storage_node() - - if storage_type is None: - if self._pubsub_support(): - self._pubsub_store(storage_node) - if self.conversion: - # Only push to either pubsub or private storage - return - self._private_store(storage_node) - elif storage_type == BookmarkStorageType.PUBSUB: - if self._pubsub_support(): - self._pubsub_store(storage_node) - elif storage_type == BookmarkStorageType.PRIVATE: + storage_node = self._build_storage_node(self.bookmarks) + if self._pubsub_support() and self.conversion: + self._pubsub_store(storage_node) + else: self._private_store(storage_node) def _pubsub_store(self, storage_node: nbxmpp.Node) -> None: @@ -301,18 +329,27 @@ class Bookmarks: log.error('Error: %s', stanza.getError()) return - def auto_join_bookmarks(self) -> None: + def _join_with_timeout(self, bookmarks: Optional[List[str]] = None) -> None: + self._join_timeouts.pop(0) + self.auto_join_bookmarks(bookmarks) + + def auto_join_bookmarks(self, bookmarks: Optional[List[str]] = None) -> None: if app.is_invisible(self._account): return - for jid, bm in self.bookmarks.items(): - if bm['autojoin']: + if bookmarks is None: + bookmarks = self.bookmarks.keys() + + for jid in bookmarks: + bookmark = self.bookmarks[jid] + if bookmark['autojoin']: # Only join non-opened groupchats. Opened one are already # auto-joined on re-connection if jid not in app.gc_connected[self._account]: # we are not already connected + log.info('Autojoin Bookmark: %s', jid) app.interface.join_gc_room( - self._account, jid, bm['nick'], - bm['password'], minimize=bm['minimize']) + self._account, jid, bookmark['nick'], + bookmark['password'], minimize=bookmark['minimize']) def add_bookmark(self, name, jid, autojoin, minimize, password, nick): @@ -325,8 +362,8 @@ class Bookmarks: 'print_status': None} self.store_bookmarks() - app.nec.push_incoming_event(BookmarksReceivedEvent( - None, account=self._account)) + app.nec.push_incoming_event( + NetworkEvent('bookmarks-received', account=self._account)) def get_name_from_bookmark(self, jid: str) -> str: fallback = jid.split('@')[0] @@ -341,9 +378,12 @@ class Bookmarks: self._con.get_module('PubSub').send_pb_purge('', 'storage:bookmarks') self._con.get_module('PubSub').send_pb_delete('', 'storage:bookmarks') + def _remove_timeouts(self): + for _id in self._join_timeouts: + GLib.source_remove(_id) -class BookmarksReceivedEvent(NetworkIncomingEvent): - name = 'bookmarks-received' + def cleanup(self): + self._remove_timeouts() def get_instance(*args, **kwargs): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/96edd79963b305517b2effce0f7415fb38… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/96edd79963b305517b2effce0f7415fb38… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix error on key press
by Philipp Hörist 16 Dec '18

16 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 19b0e73f by Philipp Hörist at 2018-12-16T00:01:44Z Fix error on key press Fixes #9471 - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/gtk/util.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -57,6 +57,7 @@ from gajim.gtk.util import convert_rgb_to_hex 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.emoji_chooser import emoji_chooser from gajim.command_system.implementation.middleware import ChatCommandProcessor @@ -81,24 +82,6 @@ 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 - def make_href(self, match): url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) color = convert_rgb_to_hex(url_color) @@ -567,20 +550,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.keyval in (Gdk.KEY_c, Gdk.KEY_Insert)): + 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/gtk/util.py ===================================== @@ -472,3 +472,11 @@ def get_show_in_systray(type_, jid): # it's not an highlighted message, don't show in systray return False return app.config.get('trayicon_notification_on_events') + + +def get_primary_accel_mod(): + """ + Returns the primary Gdk.ModifierType modifier. + cmd on osx, ctrl everywhere else. + """ + return Gtk.accelerator_parse("<Primary>")[1] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/19b0e73f444c09765f0a2a4df6fcefaa57… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/19b0e73f444c09765f0a2a4df6fcefaa57… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DBus: Show correct unread message number
by Philipp Hörist 15 Dec '18

15 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 674ec48f by Philipp Hörist at 2018-12-15T22:59:27Z DBus: Show correct unread message number Fixes #8362 - - - - - 1 changed file: - gajim/remote_control.py Changes: ===================================== 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: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/674ec48fa2b23a73e631489072829426df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/674ec48fa2b23a73e631489072829426df… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2018