Commits August 2018

commits@gajim.org

1 participants
79 discussions

[Git][gajim/gajim][master] Disco the room after it has been created
by Philipp Hörist 31 Aug '18

31 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: be96422a by Philipp Hörist at 2018-08-31T22:03:24Z Disco the room after it has been created - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1818,6 +1818,8 @@ class GroupchatControl(ChatControlBase): # app.py) self.print_conversation(_('Room logging is enabled')) if '201' in obj.status_code: + app.connections[self.account].get_module('Discovery').disco_muc( + self.room_jid, self.update_actions, update=True) self.print_conversation(_('A new room has been created')) if '210' in obj.status_code: self.print_conversation(\ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/be96422a1498cca384d4ba41e919908549… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/be96422a1498cca384d4ba41e919908549… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix missing attribute
by Philipp Hörist 31 Aug '18

31 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 527762f7 by Philipp Hörist at 2018-08-31T04:37:53Z Fix missing attribute - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -487,6 +487,7 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): self.xhtml_msgtxt = self.stanza.getXHTML() self.encrypted = self.msg_obj.encrypted self.correct_id = None # XEP-0308 + self.delayed = self.msg_obj.delayed if app.config.get('ignore_incoming_xhtml'): self.xhtml_msgtxt = None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/527762f726577e451421a2c11228e8f2a6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/527762f726577e451421a2c11228e8f2a6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Unify to use app.get_account_label()
by Philipp Hörist 30 Aug '18

30 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7743c11a by Sophie Herold at 2018-08-30T17:27:40Z Unify to use app.get_account_label() - - - - - 9 changed files: - gajim/accounts_window.py - gajim/chat_control.py - gajim/common/app.py - gajim/common/helpers.py - gajim/gtk/start_chat.py - gajim/gui_menu_builder.py - gajim/roster_window.py - gajim/statusicon.py - gajim/tooltips.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -377,8 +377,7 @@ class Account(Gtk.Box): self.options = AccountPage(account, parent) self.parent = parent - account_label = app.config.get_per('accounts', account, 'account_label') - self.label = Gtk.Label(label=account_label or account) + self.label = Gtk.Label(app.get_account_label(account)) self.label.set_halign(Gtk.Align.START) self.label.set_hexpand(True) @@ -402,9 +401,7 @@ class Account(Gtk.Box): self.parent.set_page(self.options, 'account') def update(self): - account_label = app.config.get_per( - 'accounts', self.account, 'account_label') - self.label.set_text(account_label or self.account) + self.label.set_text(app.get_account_label(self.account)) self._update_image() def _update_image(self): @@ -453,10 +450,9 @@ class GenericOptionPage(Gtk.Box): row.get_child().on_row_activated() def set_entry_text(self, toggle, update=False): - account_label = app.config.get_per( - 'accounts', self.account, 'account_label') + account_label = app.get_account_label(self.account) if update: - self.entry.set_text(account_label or self.account) + self.entry.set_text(account_label) return if toggle.get_active(): self.entry.set_sensitive(True) @@ -465,7 +461,7 @@ class GenericOptionPage(Gtk.Box): self.entry.set_sensitive(False) value = self.entry.get_text() if not value: - value = account_label or self.account + value = account_label app.config.set_per('accounts', self.account, 'account_label', value or self.account) if app.config.get_per('accounts', self.account, 'active'): ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -663,7 +663,8 @@ class ChatControl(ChatControlBase): if other_contact_.get_shown_name() == \ self.contact.get_shown_name(): acct_info = i18n.direction_mark + ' (%s)' % \ - GLib.markup_escape_text(self.account) + GLib.markup_escape_text( + app.get_account_label(self.account)) break status = contact.status ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -411,13 +411,14 @@ def get_enabled_accounts_with_labels(exclude_local=True, connected_only=False, if private_storage_only and not account_supports_private_storage(acc): continue - acc_label = config.get_per( - 'accounts', acc, 'account_label') or acc - accounts.append([acc, acc_label]) + accounts.append([acc, get_account_label(acc)]) accounts.sort(key=lambda xs: str.lower(xs[1])) return accounts +def get_account_label(account): + return config.get_per('accounts', account, 'account_label') or account + def account_is_zeroconf(account): return connections[account].is_zeroconf ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1121,10 +1121,9 @@ def get_accounts_info(): message = message.strip() if message != '': single_line += ': ' + message - account_label = app.config.get_per( - 'accounts', account, 'account_label') + account_label = app.get_account_label(account) accounts.append({'name': account, - 'account_label': account_label or account, + 'account_label': account_label, 'status_line': single_line, 'show': status, 'message': message}) ===================================== gajim/gtk/start_chat.py ===================================== --- a/gajim/gtk/start_chat.py +++ b/gajim/gtk/start_chat.py @@ -262,8 +262,7 @@ class ContactRow(Gtk.Grid): self.set_column_spacing(12) self.set_size_request(260, -1) self.account = account - self.account_label = app.config.get_per( - 'accounts', account, 'account_label') or account + self.account_label = app.get_account_label(account) self.show_account = show_account self.jid = jid self.contact = contact ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -799,10 +799,9 @@ def build_accounts_menu(): return if len(accounts_list) > 1: for acc in accounts_list: - label = escape_mnemonic( - app.config.get_per('accounts', acc, 'account_label')) + label = escape_mnemonic(app.get_account_label(acc)) acc_menu.append_submenu( - label or acc, get_account_menu(acc)) + label, get_account_menu(acc)) else: acc_menu = get_account_menu(accounts_list[0]) menubar.remove(menu_position) ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -1075,8 +1075,7 @@ class RosterWindow: account_name = _('Merged accounts') accounts = [] else: - acclabel = app.config.get_per('accounts', account, 'account_label') - account_name = acclabel or account + account_name = app.get_account_label(account) accounts = [account] if account in self.collapsed_rows and \ @@ -5075,9 +5074,8 @@ class RosterWindow: accounts.append(account) accounts.sort() for account in accounts: - label = app.config.get_per('accounts', account, - 'account_label') - item = Gtk.MenuItem.new_with_label(label or account) + label = app.get_account_label(account) + item = Gtk.MenuItem.new_with_label(label) account_menu = self.build_account_menu(account) item.set_submenu(account_menu) menu.append(item) ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -243,8 +243,7 @@ class StatusIcon: self.popup_menus.append(account_menu_for_chat_with) for account in accounts_list: - account_label = app.config.get_per( - 'accounts', account, 'account_label') or account + account_label = app.get_account_label(account) if app.account_is_connected(account): # for chat_with item = Gtk.MenuItem.new_with_label( @@ -287,8 +286,7 @@ class StatusIcon: self.popup_menus.append(account_menu_for_single_message) for account in accounts_list: - account_label = app.config.get_per( - 'accounts', account, 'account_label') or account + account_label = app.get_account_label(account) if app.connections[account].is_zeroconf or \ not app.account_is_connected(account): continue ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -150,12 +150,12 @@ class NotificationAreaTooltip(StatusTable): show_lock = False if message: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['account_label']) + ' - ' + message, - show_lock=show_lock, indent=False) + GLib.markup_escape_text(acct['account_label']) + ' - ' + \ + message, show_lock=show_lock, indent=False) else: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['account_label']), show_lock=show_lock, - indent=False) + GLib.markup_escape_text(acct['account_label']), + show_lock=show_lock, indent=False) for line in acct['event_lines']: self.add_text_row(' ' + line, 1) @@ -333,12 +333,12 @@ class RosterTooltip(Gtk.Window, StatusTable): show_lock = False if message: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['name']) + ' - ' + message, - show_lock=show_lock, indent=False) + GLib.markup_escape_text(acct['account_label']) + ' - ' + \ + message, show_lock=show_lock, indent=False) else: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['name']), show_lock=show_lock, - indent=False) + GLib.markup_escape_text(acct['account_label']), + show_lock=show_lock, indent=False) for line in acct['event_lines']: self.add_text_row(' ' + line, 1) @@ -371,7 +371,7 @@ class RosterTooltip(Gtk.Window, StatusTable): nbr_on, nbr_total = app.\ contacts.get_nb_online_total_contacts( accounts=[account]) - account_name = account + account_name = app.get_account_label(account) if app.account_is_connected(account): account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7743c11a50fe43d9baf00aa16f274cb7b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7743c11a50fe43d9baf00aa16f274cb7b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Parse delay after decryption
by Philipp Hörist 30 Aug '18

30 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a342611 by Philipp Hörist at 2018-08-30T17:19:47Z Parse delay after decryption Delay could be encrypted with full stanza encryption - - - - - dd8dda9b by Philipp Hörist at 2018-08-30T17:19:47Z Fix displaying MUC subjects with delay tag Dont print it as "old" conversation, instead add the delay timestamp at the end of the subject - - - - - 5 changed files: - gajim/common/connection_handlers_events.py - gajim/common/modules/message.py - gajim/groupchat_control.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -25,7 +25,6 @@ from calendar import timegm import hashlib import hmac import logging -import sys from time import time as time_time import OpenSSL.crypto @@ -499,13 +498,13 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): # message from server self.nick = '' - self.has_timestamp = bool(self.stanza.timestamp) - self.subject = self.stanza.getSubject() if self.subject is not None: - app.nec.push_incoming_event(GcSubjectReceivedEvent(None, - conn=self.conn, msg_event=self)) + app.nec.push_incoming_event( + nec.NetworkEvent('gc-subject-received', + nickname=self.msg_obj.resource, + **vars(self.msg_obj))) return conditions = self.stanza.getStatusConditions() @@ -566,21 +565,6 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): return True -class GcSubjectReceivedEvent(nec.NetworkIncomingEvent): - name = 'gc-subject-received' - base_network_events = [] - - def generate(self): - self.conn = self.msg_event.conn - self.stanza = self.msg_event.stanza - self.room_jid = self.msg_event.room_jid - self.nickname = self.msg_event.nickname - self.fjid = self.msg_event.fjid - self.subject = self.msg_event.subject - self.msgtxt = self.msg_event.msgtxt - self.has_timestamp = self.msg_event.has_timestamp - return True - class GcConfigChangedReceivedEvent(nec.NetworkIncomingEvent): name = 'gc-config-changed-received' base_network_events = [] ===================================== gajim/common/modules/message.py ===================================== --- a/gajim/common/modules/message.py +++ b/gajim/common/modules/message.py @@ -178,10 +178,6 @@ class Message: session.last_receive = time.time() - timestamp = parse_delay(stanza) - if timestamp is None: - timestamp = time.time() - event_attr = { 'conn': self._con, 'stanza': stanza, @@ -191,7 +187,6 @@ class Message: 'additional_data': {}, 'forwarded': forwarded, 'sent': sent, - 'timestamp': timestamp, 'fjid': fjid, 'jid': jid, 'resource': resource, @@ -223,6 +218,11 @@ class Message: except nbxmpp.NodeProcessed: return + timestamp, delayed = parse_delay(event.stanza), True + if timestamp is None: + timestamp = time.time() + delayed = False + event_attr = { 'popup': False, 'msg_log_id': None, @@ -234,6 +234,8 @@ class Message: 'form_node': parse_form(event.stanza), 'xhtml': parse_xhtml(event.stanza), 'chatstate': parse_chatstate(event.stanza), + 'timestamp': timestamp, + 'delayed': delayed, } parse_oob(event.stanza, event.additional_data) @@ -245,7 +247,7 @@ class Message: event.msgtxt = _('message') self._con.dispatch_error_message( event.stanza, event.msgtxt, - event.session, event.fjid, event.timestamp) + event.session, event.fjid, timestamp) return if event.mtype == 'groupchat': ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1239,7 +1239,7 @@ class GroupchatControl(ChatControlBase): additional_data=obj.additional_data) else: # message from someone - if obj.has_timestamp: + if obj.delayed: # don't print xhtml if it's an old message. # Like that xhtml messages are grayed too. self.print_old_conversation( @@ -1492,20 +1492,22 @@ class GroupchatControl(ChatControlBase): self.subject = subject self.draw_banner_text() - def _nec_gc_subject_received(self, obj): - if obj.conn.name != self.account: + def _nec_gc_subject_received(self, event): + if event.conn.name != self.account: return - if obj.room_jid != self.room_jid: + if event.jid != self.room_jid: return - self.set_subject(obj.subject) + self.set_subject(event.subject) text = _('%(nick)s has set the subject to %(subject)s') % { - 'nick': obj.nickname, 'subject': obj.subject} - if obj.has_timestamp: - self.print_old_conversation(text) - else: - self.print_conversation(text) + 'nick': event.nickname, 'subject': event.subject} + + if event.delayed: + date = time.strftime('%d-%m-%Y %H:%M:%S', + time.localtime(event.timestamp)) + text = '%s - %s' % (text, date) + self.print_conversation(text) - if obj.subject == '': + if event.subject == '': self.subject_button.hide() else: self.subject_button.show() ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -383,7 +383,7 @@ class GajimRemote(Server): # event has not been handled at GUI level return self.raise_signal('GCMessage', (obj.conn.name, [obj.fjid, obj.msgtxt, - obj.timestamp, obj.has_timestamp, obj.xhtml_msgtxt, obj.status_code, + obj.timestamp, obj.delayed, obj.xhtml_msgtxt, obj.status_code, obj.displaymarking, obj.captcha_form, obj.needs_highlight])) def on_our_status(self, obj): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2694,10 +2694,10 @@ class RosterWindow: def _nec_gc_subject_received(self, obj): contact = app.contacts.get_contact_with_highest_priority( - obj.conn.name, obj.room_jid) + obj.conn.name, obj.jid) if contact: contact.status = obj.subject - self.draw_contact(obj.room_jid, obj.conn.name) + self.draw_contact(obj.jid, obj.conn.name) def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/08d0cde95dbe064a5a8a2b666c35c7775… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/08d0cde95dbe064a5a8a2b666c35c7775… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] improve string for translators
by Yann Leboulanger 30 Aug '18

30 Aug '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 08d0cde9 by Yann Leboulanger at 2018-08-30T12:57:33Z improve string for translators - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1586,7 +1586,8 @@ class GroupchatControl(ChatControlBase): self.print_conversation(_('Ping? (%s)') % nick) elif obj.name == 'ping-reply': self.print_conversation( - _('Pong! (%s %s s.)') % (nick, obj.seconds)) + _('Pong! (%(nick)s %(delay)s s.)') % {'nick': nick, + 'delay': obj.seconds}) elif obj.name == 'ping-error': self.print_conversation(_('Error.')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08d0cde95dbe064a5a8a2b666c35c77755… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08d0cde95dbe064a5a8a2b666c35c77755… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] better fix for joining groupchats with uppercase letters. Fixes #9198
by Yann Leboulanger 30 Aug '18

30 Aug '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 7d4a9b91 by Yann Leboulanger at 2018-08-30T10:21:43Z better fix for joining groupchats with uppercase letters. Fixes #9198 - - - - - 1 changed file: - gajim/gtk/join_groupchat.py Changes: ===================================== gajim/gtk/join_groupchat.py ===================================== --- a/gajim/gtk/join_groupchat.py +++ b/gajim/gtk/join_groupchat.py @@ -203,7 +203,12 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): return self.room_jid = '%s@%s' % (room, server) - self.room_jid = self.room_jid.lower() + + try: + self.room_jid = helpers.parse_jid(self.room_jid) + except helpers.InvalidFormat as error: + ErrorDialog(_('Invalid JID'), str(error), transient_for=self) + return if app.in_groupchat(account, self.room_jid): # If we already in the groupchat, join_gc_room will bring @@ -223,12 +228,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): ErrorDialog(_('Invalid Nickname'), str(error), transient_for=self) return - try: - helpers.parse_jid(self.room_jid) - except helpers.InvalidFormat as error: - ErrorDialog(_('Invalid JID'), str(error), transient_for=self) - return - if not app.account_is_connected(account): ErrorDialog( _('You are not connected to the server'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d4a9b91c8787ee2bd4821bba6a4aef93d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d4a9b91c8787ee2bd4821bba6a4aef93d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Register modules defined by plugins
by Philipp Hörist 28 Aug '18

28 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 931e3f60 by Philipp Hörist at 2018-08-28T21:03:00Z Register modules defined by plugins - - - - - 5 changed files: - gajim/accounts_window.py - gajim/common/connection_handlers.py - gajim/common/modules/__init__.py - gajim/gtk/account_wizard.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -236,6 +236,9 @@ class AccountsWindow(Gtk.ApplicationWindow): else: app.connections[account] = Connection(account) + app.plugin_manager.register_modules_for_account( + app.connections[account]) + # update variables app.interface.instances[account] = { 'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -408,6 +408,9 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, self.continue_connect_info = None + # If handlers have been registered + self.handlers_registered = False + app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(NotificationEvent) @@ -655,9 +658,11 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, for handler in modules.get_handlers(self): con.RegisterHandler(*handler) + self.handlers_registered = True def _unregister_handlers(self): if not self.connection: return for handler in modules.get_handlers(self): self.connection.UnregisterHandler(*handler) + self.handlers_registered = False ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -80,10 +80,27 @@ def register(con, *args, **kwargs): _modules[con.name][name] = instance +def register_single(con, instance, name): + if con.name not in _modules: + raise ValueError('Unknown account name: %s' % con.name) + _modules[con.name][name] = instance + + def unregister(con): + for instance in _modules[con.name].values(): + if hasattr(instance, 'cleanup'): + instance.cleanup() del _modules[con.name] +def unregister_single(con, name): + if con.name not in _modules: + return + if name not in _modules[con.name]: + return + del _modules[con.name][name] + + def get(account, name): try: return _modules[account][name] ===================================== gajim/gtk/account_wizard.py ===================================== --- a/gajim/gtk/account_wizard.py +++ b/gajim/gtk/account_wizard.py @@ -288,6 +288,7 @@ class AccountCreationWizard: 100, self.update_progressbar) # Get form from serveur con = connection.Connection(self.account) + app.plugin_manager.register_modules_for_account(con) app.connections[self.account] = con con.new_account(self.account, config) elif cur_page == 3: ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -38,6 +38,7 @@ import gajim from gajim.common import app from gajim.common import nec from gajim.common import configpaths +from gajim.common import modules from gajim.common.exceptions import PluginsystemError from gajim.plugins.helpers import log, log_calls, Singleton @@ -352,6 +353,38 @@ class PluginManager(metaclass=Singleton): if plugin.encryption_name: del self.encryption_plugins[plugin.encryption_name] + def _register_modules_with_handlers(self, plugin): + if not hasattr(plugin, 'modules'): + return + for con in app.connections.values(): + for module in plugin.modules: + instance, name = module.get_instance(con) + if not module.zeroconf and con.name == 'Local': + continue + modules.register_single(con, instance, name) + + # If handlers have been registered, register the + # plugin handlers. Otherwise this will be done + # automatically on connecting + # in connection_handlers._register_handlers() + if con.handlers_registered: + for handler in instance.handlers: + con.connection.RegisterHandler(*handler) + + def _unregister_modules_with_handlers(self, plugin): + if not hasattr(plugin, 'modules'): + return + for con in app.connections.values(): + for module in plugin.modules: + instance = con.get_module(module.name) + modules.unregister_single(con, module.name) + + # Account is still connected and handlers are registered + # So just unregister the plugin handlers + if con.handlers_registered: + for handler in instance.handlers: + con.connection.UnregisterHandler(*handler) + @log_calls('PluginManager') def activate_plugin(self, plugin): ''' @@ -365,6 +398,7 @@ class PluginManager(metaclass=Singleton): self._handle_all_gui_extension_points_with_plugin(plugin) self._register_events_handlers_in_ged(plugin) self._register_network_events_in_nec(plugin) + self._register_modules_with_handlers(plugin) self.active_plugins.append(plugin) try: @@ -402,6 +436,7 @@ class PluginManager(metaclass=Singleton): self._remove_events_handler_from_ged(plugin) self._remove_network_events_from_nec(plugin) self._remove_name_from_encryption_plugins(plugin) + self._unregister_modules_with_handlers(plugin) # removing plug-in from active plug-ins list plugin.deactivate() @@ -462,6 +497,24 @@ class PluginManager(metaclass=Singleton): except GajimPluginActivateException: pass + def register_modules_for_account(self, con): + ''' + A new account has been added, register modules + of all active plugins + ''' + for plugin in self.plugins: + if not plugin.active: + return + + if not hasattr(plugin, 'modules'): + return + + for module in plugin.modules: + instance, name = module.get_instance(con) + if not module.zeroconf and con.name == 'Local': + continue + modules.register_single(con, instance, name) + def _plugin_is_active_in_global_config(self, plugin): return app.config.get_per('plugins', plugin.short_name, 'active') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/931e3f60ba8bcf707193ca897ede931e89… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/931e3f60ba8bcf707193ca897ede931e89… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show avatar in new message notifications
by Philipp Hörist 28 Aug '18

28 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3c492e92 by Sophie Herold at 2018-08-28T20:33:12Z Show avatar in new message notifications - - - - - 1 changed file: - gajim/notify.py Changes: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -180,7 +180,6 @@ class Notification: notification.set_title(title) if text is not None: notification.set_body(text) - notification.set_icon(icon_pixbuf) notif_id = None if event_type in (_('Contact Signed In'), _('Contact Signed Out'), _('New Message'), _('New Single Message'), _('New Private Message'), @@ -211,9 +210,14 @@ class Notification: notif_id = self._id('connection-failed', account) elif event_type in (_('New Message'), _('New Single Message'), _('New Private Message')): + avatar = app.contacts.get_avatar(account, jid) + if avatar: + icon_pixbuf = avatar notif_id = self._id('new-message', account, jid) + notification.set_icon(icon_pixbuf) notification.set_priority(Gio.NotificationPriority.NORMAL) + app.app.send_notification(notif_id, notification) def withdraw(self, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c492e92da7fdcd4e6a456820ddd697d4f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c492e92da7fdcd4e6a456820ddd697d4f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Fix empty version result
by Philipp Hörist 26 Aug '18

26 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d57bfcbc by Philipp Hörist at 2018-08-26T08:39:29Z ServerInfo: Fix empty version result Fixes #9311 - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== --- a/gajim/gtk/server_info.py +++ b/gajim/gtk/server_info.py @@ -129,7 +129,7 @@ class ServerInfoDialog(Gtk.Dialog): def _nec_version_result_received(self, obj): if obj.jid != self.hostname: return - self.version = obj.client_info + self.version = obj.client_info or _('Unknown') self.update(self.get_infos, self.info_listbox) def _server_disco_received(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d57bfcbcad543e47c3c63548f9aa49036e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d57bfcbcad543e47c3c63548f9aa49036e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] ServerInfo: Fix empty version result
by Philipp Hörist 26 Aug '18

26 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6e8f064f by Philipp Hörist at 2018-08-26T08:38:42Z ServerInfo: Fix empty version result Fixes #9311 - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== --- a/gajim/gtk/server_info.py +++ b/gajim/gtk/server_info.py @@ -129,7 +129,7 @@ class ServerInfoDialog(Gtk.Dialog): def _nec_version_result_received(self, obj): if obj.jid != self.hostname: return - self.version = obj.client_info + self.version = obj.client_info or _('Unknown') self.update(self.get_infos, self.info_listbox) def _server_disco_received(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e8f064fd02bf60f80bd567a5990c05379… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e8f064fd02bf60f80bd567a5990c05379… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2018