Commits December 2017

commits@gajim.org

1 participants
64 discussions

[Git][gajim/gajim][master] 3 commits: Fix Gajim’s .desktop file to pass the URI to the program.
by Yann Leboulanger 15 Dec '17

15 Dec '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d8bba454 by Emmanuel Gil Peyrot at 2017-12-15T02:34:45+01:00 Fix Gajim’s .desktop file to pass the URI to the program. - - - - - 1959b486 by Emmanuel Gil Peyrot at 2017-12-15T02:34:45+01:00 Remove gajim-remote.desktop, its URI handling is now done in Gajim itself. - - - - - d858ff51 by Yann Leboulanger at 2017-12-15T08:29:37+01:00 Merge branch 'remove-gajim-remote-desktop' into 'master' Remove gajim-remote.desktop and fix gajim.desktop See merge request gajim/gajim!169 - - - - - 3 changed files: - − data/gajim-remote.desktop.in - data/org.gajim.Gajim.desktop.in - setup.py Changes: ===================================== data/gajim-remote.desktop.in deleted ===================================== --- a/data/gajim-remote.desktop.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly; -Name=Open URI using Gajim -# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip; -Version=1.0 -Exec=gajim-remote handle_uri %u -TryExec=gajim-remote -StartupNotify=false -Terminal=false -Type=Application -NoDisplay=true ===================================== data/org.gajim.Gajim.desktop.in ===================================== --- a/data/org.gajim.Gajim.desktop.in +++ b/data/org.gajim.Gajim.desktop.in @@ -6,7 +6,7 @@ Comment=A GTK+ Jabber client # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;xmpp;bonjour;voip; Version=1.0 -Exec=gajim +Exec=gajim %u # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gajim.Gajim StartupNotify=true ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -29,7 +29,6 @@ def update_trans(): template = os.path.join('po', 'gajim.pot') files = [os.path.join(root, f) for root, d, files in os.walk('gajim') for f in files if os.path.isfile( os.path.join(root, f)) and (f.endswith('.py') or f.endswith('.ui'))] - files.append(os.path.join("data", "gajim-remote.desktop.in")) files.append(os.path.join("data", "org.gajim.Gajim.desktop.in")) files.append(os.path.join("data", "org.gajim.Gajim.appdata.xml.in")) cmd = 'xgettext --from-code=utf-8 -o %s %s' % ( @@ -116,7 +115,6 @@ def build_intl(build_cmd): base = build_dir merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), - ('data/gajim-remote.desktop', 'share/applications', '--desktop'), ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml')) for filename, target, option in merge_files: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4009625e02c08e1adfb66557648a2cbf7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4009625e02c08e1adfb66557648a2cbf7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch invalid URIs
by Philipp Hörist 14 Dec '17

14 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4009625e by Philipp Hörist at 2017-12-14T20:19:12+01:00 Catch invalid URIs - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -235,17 +235,22 @@ class GajimApplication(Gtk.Application): gui_menu_builder.build_accounts_menu() def _open(self, application, file, hint, *args): + from gajim.common import app for arg in file: uri = arg.get_uri() + app.log('uri_handler').info('open %s', uri) # remove xmpp:/// uri = uri[8:] - jid, cmd = uri.split('?') + try: + jid, cmd = uri.split('?') + except ValueError: + # Invalid URI + return if cmd == 'join': self.interface.join_gc_minimal(None, jid) elif cmd == 'roster': self.activate_action('add-contact', GLib.Variant('s', jid)) elif cmd == 'message': - from gajim.common import app accounts = list(app.connections.keys()) if not accounts: continue View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4009625e02c08e1adfb66557648a2cbf7f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4009625e02c08e1adfb66557648a2cbf7f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove support for AWN, which isn’t maintained anymore
by Yann Leboulanger 13 Dec '17

13 Dec '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: f4cae17d by Emmanuel Gil Peyrot at 2017-12-13T23:19:16+01:00 Remove support for AWN, which isn’t maintained anymore - - - - - 2604c22e by Yann Leboulanger at 2017-12-13T23:32:50+01:00 Merge branch 'remove-awn-support' into 'master' Remove support for AWN See merge request gajim/gajim!168 - - - - - 2 changed files: - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2185,33 +2185,6 @@ class Interface: ################################################################################ - @staticmethod - def change_awn_icon_status(status): - if not dbus_support.supported: - # do nothing if user doesn't have D-Bus bindings - return - try: - bus = dbus.SessionBus() - if not 'com.google.code.Awn' in bus.list_names(): - # Awn is not installed - return - except Exception: - return - iconset = app.config.get('iconset') - prefix = os.path.join(helpers.get_iconset_path(iconset), '32x32') - if status in ('chat', 'away', 'xa', 'dnd', 'invisible', 'offline'): - status = status + '.png' - elif status == 'online': - prefix = '' - status = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 32) - path = os.path.join(prefix, status) - try: - obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn') - awn = dbus.Interface(obj, 'com.google.code.Awn') - awn.SetTaskIconByName('Gajim', os.path.abspath(path)) - except Exception: - pass - def enable_music_listener(self): listener = MusicTrackListener.get() if not self.music_track_changed_signal: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2335,7 +2335,6 @@ class RosterWindow: liststore.prepend([status_combobox_text, app.interface.jabber_state_images['16'][show], show, False]) self.status_combobox.set_active(0) - app.interface.change_awn_icon_status(show) self.combobox_callback_active = True if app.interface.systray_enabled: app.interface.systray.change_status(show) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e7fcea288ac957a746b85c9482ba6dc3… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e7fcea288ac957a746b85c9482ba6dc3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Port logind_listener to GTK dbus
by Yann Leboulanger 13 Dec '17

13 Dec '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 5364c198 by André Apitzsch at 2017-12-09T15:04:15+01:00 Port logind_listener to GTK dbus - - - - - 4e7fcea2 by Yann Leboulanger at 2017-12-13T21:57:57+01:00 Merge branch 'logind' into 'master' Port logind_listener to GTK dbus See merge request gajim/gajim!167 - - - - - 2 changed files: - gajim/gui_interface.py - gajim/logind_listener.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2852,8 +2852,7 @@ class Interface: self.remote_ctrl = None - if dbus_support.supported: - from gajim import logind_listener + from gajim import logind_listener # Handle gnome screensaver if dbus_support.supported: ===================================== gajim/logind_listener.py ===================================== --- a/gajim/logind_listener.py +++ b/gajim/logind_listener.py @@ -25,23 +25,29 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/inhibit import os import logging -from gajim.common import dbus_support +from gi.repository import Gio, GLib + from gajim.common import app log = logging.getLogger('gajim.logind_listener') -supported = False -fd = -1 # file descriptor of the inhibitor; negative number means we don't - # hold any (yet) + +# file descriptor of the inhibitor; negative number means we don't +# hold any (yet) +fd = -1 -def on_suspend(active): +def signal_received(connection, sender_name, object_path, + interface_name, signal_name, parameters, *user_data): '''Signal handler for suspend event''' global fd - if not active: - # we just resumed, we should take another inhibitor - get_inhibitor() + connected = None + log.info('Signal received: %s - %s', interface_name, parameters) + + # signal is sent right before (with the parameter True) and after + # (with the parameter False) the system goes down for suspend/hibernate + if not parameters[0]: return # we're going for suspend, let's disconnect @@ -62,53 +68,54 @@ def on_suspend(active): # something is wrong, the system is suspending but we don't have # a lock file log.warning("System suspend detected, but we don't seem to be holding " - "a file descriptor for sleep inihibitor") + "a file descriptor for sleep inihibitor") + -def get_inhibitor(): +def get_inhibitor(connection): '''Ask for a suspend delay inhibitor''' - from gajim.common.dbus_support import system_bus, dbus - bus = system_bus.bus() global fd if fd >= 0: # someting is wrong, we haven't closed the previous file descriptor # and we ask for yet another one log.warning('We are about to ask for a sleep inhibitor, but we seem ' - 'to be holding one already') - - login_object = bus.get_object('org.freedesktop.login1', - '/org/freedesktop/login1') - login_manager = dbus.Interface(login_object, - 'org.freedesktop.login1.Manager') - - ret = login_manager.Inhibit('sleep', 'Gajim', 'Disconnect from the network', - 'delay') - fd = ret.take() - -def set_listener(): - '''Set up a listener for suspend signals - - @return bool whether it succeeded - ''' - from gajim.common.dbus_support import system_bus - bus = system_bus.bus() - - if not 'org.freedesktop.login1' in bus.list_names(): - # logind is not present - log.debug("logind is not on D-Bus, not activating logind listener") - return False - - bus.add_signal_receiver(on_suspend, signal_name='PrepareForSleep', - bus_name='org.freedesktop.login1', - path='/org/freedesktop/login1', - dbus_interface='org.freedesktop.login1.Manager') - return True - -if dbus_support.supported: - try: - if set_listener(): - get_inhibitor() - supported = True - except Exception as ex: - log.error("A problem occured while activating logind listener") + 'to be holding one already') + + ret = connection.call_sync( + 'org.freedesktop.login1', + '/org/freedesktop/login1', + 'org.freedesktop.login1.Manager', + 'Inhibit', + GLib.Variant('(ssss)', ('sleep', 'org.gajim.Gajim', + 'Disconnect from the network', 'delay')), + None, + Gio.DBusCallFlags.NONE, -1, None) + + fd = ret[0] + + +def appeared(connection, name, name_owner, *user_data): + '''Set up a listener for suspend signals''' + global supported + supported = True + log.info('%s appeared', name) + if name == 'org.freedesktop.login1': + connection.signal_subscribe( + 'org.freedesktop.login1', + 'org.freedesktop.login1.Manager', + 'PrepareForSleep', + '/org/freedesktop/login1', + None, + Gio.DBusSignalFlags.NONE, + signal_received, + None) + get_inhibitor(connection) + + +Gio.bus_watch_name( + Gio.BusType.SYSTEM, + 'org.freedesktop.login1', + Gio.BusNameWatcherFlags.NONE, + appeared, + None) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a39d68d4aeb5402fdf48f49df2cc82e63… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a39d68d4aeb5402fdf48f49df2cc82e63… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] when internet connection is back, only connect accounts that were
by Yann Leboulanger 11 Dec '17

11 Dec '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: a39d68d4 by Yann Leboulanger at 2017-12-11T21:13:53+01:00 when internet connection is back, only connect accounts that were connected before connection broke - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2622,7 +2622,7 @@ class Interface: self.network_state = connected if connected: for connection in app.connections.values(): - if connection.connected <= 0: + if connection.connected <= 0 and connection.time_to_reconnect: log.info('Connect %s', connection.name) connection.reconnect() else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a39d68d4aeb5402fdf48f49df2cc82e636… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a39d68d4aeb5402fdf48f49df2cc82e636… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Load client certs in binary mode
by Philipp Hörist 11 Dec '17

11 Dec '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f005d610 by Philipp Hörist at 2017-12-11T18:49:55+01:00 Load client certs in binary mode Fixes #46 - - - - - 1 changed file: - nbxmpp/tls_nb.py Changes: ===================================== nbxmpp/tls_nb.py ===================================== --- a/nbxmpp/tls_nb.py +++ b/nbxmpp/tls_nb.py @@ -407,7 +407,7 @@ class NonBlockingTLS(PlugIn): conn = tcpsock._owner._caller log.debug('Using client cert and key from %s' % conn.client_cert) try: - p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read(), + p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert, 'rb').read(), conn.client_cert_passphrase) except OpenSSL.crypto.Error as exception_obj: log.warning('Unable to load client pkcs12 certificate from ' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f005d610c74ea0102b04ad5972… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f005d610c74ea0102b04ad5972… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix var reference
by Philipp Hörist 10 Dec '17

10 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f8ddefb6 by Philipp Hörist at 2017-12-10T22:56:20+01:00 Fix var reference - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -283,7 +283,7 @@ class CommonConnection: self.check_jid(obj.jid) except helpers.InvalidFormat: app.nec.push_incoming_event(InformationEvent( - None, dialog_name='invalid-jid', args=jid)) + None, dialog_name='invalid-jid', args=obj.jid)) return if obj.message and not obj.xhtml and app.config.get( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f8ddefb6da01d3695fc04463adf26c9ea4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f8ddefb6da01d3695fc04463adf26c9ea4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont use callbacks when sending messages
by Philipp Hörist 10 Dec '17

10 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7815ce19 by Philipp Hörist at 2017-12-10T18:56:29+01:00 Dont use callbacks when sending messages Using a callback to display a sent message inside the ChatControl means that all messages we send have to be issued from the GUI layer (send_message()) if we want them to display in the ChatControl. This replaces the callback and catches the stanza-message-outgoing event after it was processed by the core. This is easier to read/understand than dealing with callbacks and lets the core issue messages without having to care if a ChatControl is open or not - - - - - 6 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -236,6 +236,8 @@ class ChatControl(ChatControlBase): self._nec_chatstate_received) app.ged.register_event_handler('caps-received', ged.GUI1, self._nec_caps_received) + app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, + self._message_sent) # PluginSystem: adding GUI extension point for this ChatControl # instance object @@ -811,6 +813,35 @@ class ChatControl(ChatControlBase): app.plugin_manager.extension_point( 'encryption_dialog' + self.encryption, self) + def _message_sent(self, obj): + if obj.conn.name != self.account: + return + if obj.jid != self.contact.jid: + return + if not obj.message: + return + + self.last_sent_msg = obj.stanza_id + id_ = obj.msg_iq.getID() + xep0184_id = None + if self.contact.jid != app.get_jid_from_account(self.account): + if app.config.get_per('accounts', self.account, 'request_receipt'): + xep0184_id = id_ + if obj.label: + displaymarking = obj.label.getTag('displaymarking') + else: + displaymarking = None + if self.correcting: + self.correcting = False + gtkgui_helpers.remove_css_class( + self.msg_textview, 'msgcorrectingcolor') + + self.print_conversation(obj.message, self.contact.jid, tim=obj.timestamp, + encrypted=obj.encrypted, xep0184_id=xep0184_id, xhtml=obj.xhtml, + displaymarking=displaymarking, msg_stanza_id=id_, + correct_id=obj.correct_id, + additional_data=obj.additional_data) + def send_message(self, message, keyID='', chatstate=None, xhtml=None, process_commands=True, attention=False): """ @@ -843,32 +874,9 @@ class ChatControl(ChatControlBase): self._schedule_activity_timers() - def _on_sent(obj, msg_stanza, message, encrypted, xhtml, label): - id_ = msg_stanza.getID() - xep0184_id = None - if self.contact.jid != app.get_jid_from_account(self.account): - if app.config.get_per('accounts', self.account, 'request_receipt'): - xep0184_id = id_ - if label: - displaymarking = label.getTag('displaymarking') - else: - displaymarking = None - if self.correcting: - self.correcting = False - gtkgui_helpers.remove_css_class( - self.msg_textview, 'msgcorrectingcolor') - - self.print_conversation(message, self.contact.jid, tim=obj.timestamp, - encrypted=encrypted, xep0184_id=xep0184_id, xhtml=xhtml, - displaymarking=displaymarking, msg_stanza_id=id_, - correct_id=obj.correct_id, - additional_data=obj.additional_data) - ChatControlBase.send_message(self, message, keyID, type_='chat', - chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent, - callback_args=[message, self.encryption, xhtml, self.get_seclabel()], - process_commands=process_commands, - attention=attention) + chatstate=chatstate_to_send, xhtml=xhtml, + process_commands=process_commands, attention=attention) def on_cancel_session_negotiation(self): msg = _('Session negotiation cancelled') @@ -1138,6 +1146,8 @@ class ChatControl(ChatControlBase): self._nec_chatstate_received) app.ged.remove_event_handler('caps-received', ged.GUI1, self._nec_caps_received) + app.ged.remove_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, + self._message_sent) self.unsubscribe_events() ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -742,17 +742,13 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): return label def send_message(self, message, keyID='', type_='chat', chatstate=None, - resource=None, xhtml=None, callback=None, callback_args=None, - process_commands=True, attention=False): + resource=None, xhtml=None, process_commands=True, attention=False): """ Send the given message to the active tab. Doesn't return None if error """ if not message or message == '\n': return None - if callback_args is None: - callback_args = [] - if process_commands and self.process_as_command(message): return @@ -766,11 +762,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): label = self.get_seclabel() - def _cb(obj, msg, cb, *cb_args): - self.last_sent_msg = obj.stanza_id - if cb: - cb(obj, msg, *cb_args) - if self.correcting and self.last_sent_msg: correct_id = self.last_sent_msg else: @@ -780,8 +771,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): account=self.account, jid=self.contact.jid, message=message, keyID=keyID, type_=type_, chatstate=chatstate, resource=resource, user_nick=self.user_nick, xhtml=xhtml, - label=label, callback=_cb, callback_args=[callback] + callback_args, - control=self, attention=attention, correct_id=correct_id, + label=label, control=self, attention=attention, correct_id=correct_id, automatic_message=False, encryption=self.encryption)) # Record the history of sent messages ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -2061,6 +2061,9 @@ class Connection(CommonConnection, ConnectionHandlers): if encryption: app.plugin_manager.extension_point( 'encrypt' + encryption, self, obj, self.send_message) + if not obj.encrypted: + # Dont propagate event + return True else: self.send_message(obj) @@ -2072,8 +2075,6 @@ class Connection(CommonConnection, ConnectionHandlers): None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID, chatstate=obj.chatstate, automatic_message=obj.automatic_message, stanza_id=obj.stanza_id, additional_data=obj.additional_data)) - if obj.callback: - obj.callback(obj, obj.msg_iq, *obj.callback_args) if isinstance(obj.jid, list): for j in obj.jid: @@ -2702,8 +2703,6 @@ class Connection(CommonConnection, ConnectionHandlers): None, conn=self, jid=obj.jid, message=obj.message, keyID=None, chatstate=None, automatic_message=obj.automatic_message, stanza_id=obj.stanza_id, additional_data=obj.additional_data)) - if obj.callback: - obj.callback(obj) def send_gc_subject(self, jid, subject): if not app.account_is_connected(self.name): ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -2845,6 +2845,7 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): self.correct_id = None self.automatic_message = True self.encryption = '' + self.encrypted = False def get_full_jid(self): if self.resource: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -342,8 +342,6 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): jid=obj.jid, message=obj.message, keyID=obj.keyID, automatic_message=obj.automatic_message, chatstate=None, stanza_id=stanza_id)) - if obj.callback: - obj.callback(obj.msg_iq, *obj.callback_args) self.log_message(obj, obj.jid) @@ -352,6 +350,8 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): app.nec.push_incoming_event(MessageErrorEvent(None, conn=self, fjid=obj.jid, error_code=-1, error_msg=reason, msg=None, time_=None, session=obj.session)) + # Dont propagate event + return True ret = self.connection.send( obj.msg_iq, obj.message is not None, @@ -363,6 +363,8 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): fjid=obj.jid, error_code=-1, error_msg=_( 'Contact is offline. Your message could not be sent.'), msg=None, time_=None, session=obj.session)) + # Dont propagate event + return True def send_stanza(self, stanza): # send a stanza untouched ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -493,6 +493,8 @@ class GroupchatControl(ChatControlBase): self._nec_signed_in) app.ged.register_event_handler('decrypted-message-received', ged.GUI2, self._nec_decrypted_message_received) + app.ged.register_event_handler('gc-stanza-message-outgoing', ged.OUT_POSTCORE, + self._message_sent) app.gc_connected[self.account][self.room_jid] = False # disable win, we are not connected yet ChatControlBase.got_disconnected(self) @@ -1985,6 +1987,15 @@ class GroupchatControl(ChatControlBase): if self.model.iter_n_children(parent_iter) == 0: self.model.remove(parent_iter) + def _message_sent(self, obj): + # we'll save sent message text when we'll receive it in + # _nec_gc_message_received + self.last_sent_msg = obj.stanza_id + if self.correcting: + self.correcting = False + gtkgui_helpers.remove_css_class( + self.msg_textview, 'msgcorrectingcolor') + def send_message(self, message, xhtml=None, process_commands=True): """ Call this function to send our message @@ -2011,15 +2022,6 @@ class GroupchatControl(ChatControlBase): if message != '' or message != '\n': self.save_message(message, 'sent') - def _cb(obj): - # we'll save sent message text when we'll receive it in - # _nec_gc_message_received - self.last_sent_msg = obj.stanza_id - if self.correcting: - self.correcting = False - gtkgui_helpers.remove_css_class( - self.msg_textview, 'msgcorrectingcolor') - if self.correcting and self.last_sent_msg: correct_id = self.last_sent_msg else: @@ -2027,7 +2029,7 @@ class GroupchatControl(ChatControlBase): # Send the message app.nec.push_outgoing_event(GcMessageOutgoingEvent(None, account=self.account, jid=self.room_jid, message=message, - xhtml=xhtml, label=label, callback=_cb, correct_id=correct_id, + xhtml=xhtml, label=label, correct_id=correct_id, automatic_message=False)) self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() @@ -2148,6 +2150,8 @@ class GroupchatControl(ChatControlBase): self._nec_signed_in) app.ged.remove_event_handler('decrypted-message-received', ged.GUI2, self._nec_decrypted_message_received) + app.ged.remove_event_handler('gc-stanza-message-outgoing', ged.OUT_POSTCORE, + self._message_sent) if self.room_jid in app.gc_connected[self.account] and \ app.gc_connected[self.account][self.room_jid]: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7815ce19a54e70563ae044455144c636e5… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7815ce19a54e70563ae044455144c636e5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove upower_listener
by Philipp Hörist 09 Dec '17

09 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: be32d9af by André Apitzsch at 2017-12-09T00:34:47+01:00 Remove upower_listener the 'Sleeping' signal has been removed from UPower about four years ago https://cgit.freedesktop.org/upower/commit/src/org.freedesktop.UPower.xml?i… - - - - - 4cccdad5 by Philipp Hörist at 2017-12-09T11:43:28+01:00 Merge branch 'removeUpower' into 'master' Remove upower_listener See merge request gajim/gajim!166 - - - - - 3 changed files: - gajim/features_window.py - gajim/gui_interface.py - − gajim/upower_listener.py Changes: ===================================== gajim/features_window.py ===================================== --- a/gajim/features_window.py +++ b/gajim/features_window.py @@ -85,10 +85,6 @@ class FeaturesWindow: _('Ability to request your router to forward port for file transfer.'), _('Requires gir1.2-gupnpigd-1.0.'), _('Feature not available under Windows.')), - _('UPower'): (self.upower_available, - _('Ability to disconnect properly just before suspending the machine.'), - _('Requires upower and python-dbus.'), - _('Feature not available under Windows.')), } # name, supported @@ -186,8 +182,3 @@ class FeaturesWindow: def gupnp_igd_available(self): return app.HAVE_UPNP_IGD - def upower_available(self): - if os.name == 'nt': - return False - from gajim import upower_listener - return upower_listener.supported ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2853,7 +2853,6 @@ class Interface: self.remote_ctrl = None if dbus_support.supported: - from gajim import upower_listener from gajim import logind_listener # Handle gnome screensaver ===================================== gajim/upower_listener.py deleted ===================================== --- a/gajim/upower_listener.py +++ /dev/null @@ -1,47 +0,0 @@ -## src/upower_listener.py -## -## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - - -supported = False - -from gajim.common import dbus_support -from gajim.common import app - -def on_suspend(*args, **kwargs): - for name, conn in app.connections.items(): - if app.account_is_connected(name): - conn.old_show = app.SHOW_LIST[conn.connected] - st = conn.status - conn.change_status('offline', _('Machine going to sleep')) - conn.status = st - conn.time_to_reconnect = 5 - -if dbus_support.supported: - try: - from gajim.common.dbus_support import system_bus - bus = system_bus.bus() - if 'org.freedesktop.UPower' in bus.list_names(): - up_object = bus.get_object('org.freedesktop.UPower', - '/org/freedesktop/UPower') - bus.add_signal_receiver(on_suspend, 'Sleeping', - 'org.freedesktop.UPower', 'org.freedesktop.UPower', - '/org/freedesktop/UPower') - supported = True - except Exception: - pass View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/786ef9640094cd0f8e77ec34a9ce59646… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/786ef9640094cd0f8e77ec34a9ce59646… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Port InformationEvent handling to new interface
by Philipp Hörist 08 Dec '17

08 Dec '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 786ef964 by Philipp Hörist at 2017-12-09T00:15:26+01:00 Port InformationEvent handling to new interface - - - - - 8 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/jingle_rtp.py - gajim/common/protocol/bytestream.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/dialog_messages.py - gajim/gui_interface.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -275,19 +275,15 @@ class CommonConnection: try: self.check_jid(jid) except helpers.InvalidFormat: - app.nec.push_incoming_event(InformationEvent(None, - conn=self, level='error', pri_txt=_('Invalid JID'), - sec_txt=_('It is not possible to send a message ' - 'to %s, this JID is not valid.') % jid)) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='invalid-jid', args=jid)) return else: try: self.check_jid(obj.jid) except helpers.InvalidFormat: - app.nec.push_incoming_event(InformationEvent(None, conn=self, - level='error', pri_txt=_('Invalid JID'), sec_txt=_( - 'It is not possible to send a message to %s, this JID is not ' - 'valid.') % obj.jid)) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='invalid-jid', args=jid)) return if obj.message and not obj.xhtml and app.config.get( @@ -937,11 +933,9 @@ class Connection(CommonConnection, ConnectionHandlers): self.disconnect(on_purpose=True) return if not data[1]: # wrong answer - app.nec.push_incoming_event(InformationEvent(None, - conn=self, level='error', pri_txt=_('Invalid answer'), - sec_txt=_('Transport %(name)s answered wrongly to ' - 'register request: %(error)s') % {'name': data[0], - 'error': data[3]})) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='invalid-answer', + kwargs={'name': data[0], 'error': data[3]})) return is_form = data[2] conf = data[1] @@ -1063,11 +1057,9 @@ class Connection(CommonConnection, ConnectionHandlers): try: helpers.idn_to_ascii(custom_h) except Exception: - app.nec.push_incoming_event(InformationEvent(None, - conn=self, level='error', - pri_txt=_('Wrong Custom Hostname'), - sec_txt='Wrong custom hostname "%s". Ignoring it.' \ - % custom_h)) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='invalid-custom-hostname', + args=custom_h)) use_custom = False # create connection if it doesn't already exist @@ -1584,11 +1576,8 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(PrivacyListRemovedEvent(None, conn=self, list_name=privacy_list)) else: - app.nec.push_incoming_event(InformationEvent(None, conn=self, - level='error', pri_txt=_('Error while removing privacy ' - 'list'), sec_txt=_('Privacy list %s has not been removed. ' - 'It is maybe active in one of your connected resources. ' - 'Deactivate it and try again.') % privacy_list)) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='privacy-list-error', args=privacy_list)) nbxmpp.features_nb.delPrivacyList(self.connection, privacy_list, _on_del_privacy_list_result) @@ -1771,10 +1760,8 @@ class Connection(CommonConnection, ConnectionHandlers): if not self.privacy_rules_supported: app.nec.push_incoming_event(OurShowEvent(None, conn=self, show=app.SHOW_LIST[self.connected])) - app.nec.push_incoming_event(InformationEvent(None, conn=self, - level='error', pri_txt=_('Invisibility not supported'), - sec_txt=_('Account %s doesn\'t support invisibility.') % \ - self.name)) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='invisibility-not-supported', args=self.name)) return # If we are already connected, and privacy rules are supported, send # offline presence first as it's required by XEP-0126 @@ -1896,10 +1883,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.disconnect(on_purpose=True) app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) - app.nec.push_incoming_event(InformationEvent(None, - conn=self, level='error', pri_txt=_('Invisibility not ' - 'supported'), sec_txt=_('Account %s doesn\'t support ' - 'invisibility.') % self.name)) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='invisibility-not-supported', args=self.name)) return if self.blocking_supported: self._request_blocking() @@ -2917,12 +2902,9 @@ class Connection(CommonConnection, ConnectionHandlers): if result.getID() == id_: on_remove_success(True) return - app.nec.push_incoming_event(InformationEvent(None, - conn=self, level='error', - pri_txt=_('Unregister failed'), - sec_txt=_('Unregistration with server %(server)s ' - 'failed: %(error)s') % {'server': hostname, - 'error': result.getErrorMsg()})) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='unregister-error', + kwargs={'server': hostname, 'error': result.getErrorMsg()})) on_remove_success(False) con.RegisterHandler('iq', _on_answer, 'result', system=True) con.SendAndWaitForResponse(iq) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -118,10 +118,8 @@ class ConnectionDisco: callback() return app.nec.push_incoming_event( - InformationEvent(None, conn=self, - level='error', - pri_txt=_('Unable to join Groupchat'), - sec_txt=error)) + InformationEvent( + None, dialog_name='unable-join-groupchat', args=error)) def request_register_agent_info(self, agent): if not self.connection or self.connected < 2: @@ -138,9 +136,8 @@ class ConnectionDisco: def _agent_registered_cb(self, con, resp, agent): if resp.getType() == 'result': - app.nec.push_incoming_event(InformationEvent(None, conn=self, - level='info', pri_txt=_('Registration succeeded'), sec_txt=_( - 'Registration with agent %s succeeded') % agent)) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='agent-register-success', args=agent)) self.request_subscription(agent, auto_auth=True) self.agent_registrations[agent]['roster_push'] = True if self.agent_registrations[agent]['sub_received']: @@ -148,11 +145,11 @@ class ConnectionDisco: p = self.add_sha(p) self.connection.send(p) if resp.getType() == 'error': - app.nec.push_incoming_event(InformationEvent(None, conn=self, - level='error', pri_txt=_('Registration failed'), sec_txt=_( - 'Registration with agent %(agent)s failed with error %(error)s:' - ' %(error_msg)s') % {'agent': agent, 'error': resp.getError(), - 'error_msg': resp.getErrorMsg()})) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='agent-register-error', + kwargs={'agent': agent, + 'error': resp.getError(), + 'error_msg': resp.getErrorMsg()})) def register_agent(self, agent, info, is_form=False): if not self.connection or self.connected < 2: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -2905,8 +2905,18 @@ class InformationEvent(nec.NetworkIncomingEvent): base_network_events = [] def init(self): + self.args = None + self.kwargs = {} + self.dialog_name = None self.popup = True + def generate(self): + if self.args is None: + self.args = () + else: + self.args = (self.args,) + return True + class BlockingEvent(nec.NetworkIncomingEvent): name = 'blocking' base_network_events = [] ===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -228,11 +228,9 @@ class JingleRTPContent(JingleContent): if not self.stream_failed_once: app.nec.push_incoming_event( InformationEvent( - None, conn=self.session.connection, level='error', - pri_txt=_('GStreamer error'), - sec_txt=_('Error: %(error)s\nDebug: %(debug)s' % { - 'error': message.get_structure().get_value('gerror'), - 'debug': message.get_structure().get_value('debug')}))) + None, dialog_name='gstreamer-error', + kwargs={'error': message.get_structure().get_value('gerror'), + 'debug': message.get_structure().get_value('debug')})) sink_pad = self.p2psession.get_property('sink-pad') ===================================== gajim/common/protocol/bytestream.py ===================================== --- a/gajim/common/protocol/bytestream.py +++ b/gajim/common/protocol/bytestream.py @@ -401,9 +401,8 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): self._add_streamhosts_to_query(query, sender, port, my_ips) except socket.gaierror: from gajim.common.connection_handlers_events import InformationEvent - app.nec.push_incoming_event(InformationEvent(None, conn=self, - level='error', pri_txt=_('Wrong host'), - sec_txt=_('Invalid local address? :-O'))) + app.nec.push_incoming_event( + InformationEvent(None, dialog_name='wrong-host')), def _add_addiditional_streamhosts_to_query(self, query, file_props): sender = file_props.sender ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -189,9 +189,8 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): alt_name=alt_name)) def _on_error(self, message): - app.nec.push_incoming_event(InformationEvent(None, conn=self, - level='error', pri_txt=_('Avahi error'), sec_txt=_('%s\nLink-local ' - 'messaging might not work properly.') % message)) + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='avahi-error', args=message)) def connect(self, show='online', msg=''): self.get_config_values_or_default() ===================================== gajim/dialog_messages.py ===================================== --- a/gajim/dialog_messages.py +++ b/gajim/dialog_messages.py @@ -23,6 +23,7 @@ from gi.repository import GLib from gajim.common.app import app from gajim.dialogs import ErrorDialog +from gajim.dialogs import InformationDialog Message = namedtuple('Message', ['title', 'text', 'dialog']) @@ -37,6 +38,12 @@ messages = { '%s', ErrorDialog), + 'invalid-jid': Message( + _('Invalid JID'), + _('It is not possible to send a message ' + 'to %s, this JID is not valid.'), + ErrorDialog), + 'unread-events-on-remove-account': Message( _('Unread events'), _('Read all pending events before removing this account.'), @@ -67,6 +74,65 @@ messages = { _('The JID you entered is already in the list. Choose another one.'), ErrorDialog), + 'invalid-answer': Message( + _('Invalid answer'), + _('Transport %(name)s answered wrongly to ' + 'register request: %(error)s'), + ErrorDialog), + + 'invalid-custom-hostname': Message( + _('Wrong Custom Hostname'), + _('Wrong custom hostname "%s". Ignoring it.'), + ErrorDialog), + + 'privacy-list-error': Message( + _('Error while removing privacy list'), + _('Privacy list %s has not been removed. ' + 'It is maybe active in one of your connected resources. ' + 'Deactivate it and try again.'), + ErrorDialog), + + 'invisibility-not-supported': Message( + _('Invisibility not supported'), + _('Account %s doesn\'t support invisibility.'), + ErrorDialog), + + 'unregister-error': Message( + _('Unregister failed'), + _('Unregistration with server %(server)s failed: %(error)s'), + ErrorDialog), + + 'agent-register-success': Message( + _('Registration succeeded'), + _('Registration with agent %s succeeded'), + InformationDialog), + + 'agent-register-error': Message( + _('Registration failed'), + _('Registration with agent %(agent)s failed with error %(error)s: ' + '%(error_msg)s'), + ErrorDialog), + + 'unable-join-groupchat': Message( + _('Unable to join Groupchat'), + '%s', + ErrorDialog), + + 'gstreamer-error': Message( + _('GStreamer error'), + _('Error: %(error)s\nDebug: %(debug)s'), + ErrorDialog), + + 'wrong-host': Message( + _('Wrong host'), + _('Invalid local address? :-O'), + ErrorDialog), + + 'avahi-error': Message( + _('Avahi error'), + _('%s\nLink-local messaging might not work properly.'), + ErrorDialog), + } ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -132,17 +132,23 @@ class Interface: @staticmethod def handle_event_information(obj): - if obj.popup: - if obj.level == 'error': - cls = dialogs.ErrorDialog - elif obj.level == 'warn': - cls = dialogs.WarningDialog - elif obj.level == 'info': - cls = dialogs.InformationDialog - else: - return + if not obj.popup: + return + + if obj.dialog_name is not None: + get_dialog(obj.dialog_name, *obj.args, **obj.kwargs) + return + + if obj.level == 'error': + cls = dialogs.ErrorDialog + elif obj.level == 'warn': + cls = dialogs.WarningDialog + elif obj.level == 'info': + cls = dialogs.InformationDialog + else: + return - cls(obj.pri_txt, GLib.markup_escape_text(obj.sec_txt)) + cls(obj.pri_txt, GLib.markup_escape_text(obj.sec_txt)) @staticmethod def raise_dialog(name, *args, **kwargs): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/786ef9640094cd0f8e77ec34a9ce596467… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/786ef9640094cd0f8e77ec34a9ce596467… 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 December 2017