GitLab

at 2019-01-10T20:37:47Z

Remove unused vars

DBus: Add some logging

Make sure args are always str

Fix status tray notification

Clicking on a new message notification in the status tray didnt open the chat

     def _nec_notification(self, obj):

         if obj.do_popup:

             icon_name = self._get_icon_name(obj)

-            self.popup(obj.popup_event_type, obj.jid, obj.conn.name,

+            self.popup(obj.popup_event_type, str(obj.jid), obj.conn.name,

                        obj.popup_msg_type, icon_name=icon_name,

                        title=obj.popup_title, text=obj.popup_text,

                        timeout=obj.popup_timeout)

 

     @staticmethod

     def _make_id(*args):

-        return ','.join(args)

+        return ','.join(map(str, args))

 

 

 class PopupNotification(Gtk.Window):

                     app.events.change_jid(account, fjid, jid)

                     resource = None

                     fjid = jid

+

                 contact = None

                 if resource:

-                    contact = app.contacts.get_contact(account, jid, resource) or highest_contact

-                if contact is None:

+                    contact = app.contacts.get_contact(account, jid, resource)

+                if not contact:

+                    contact = highest_contact

+                if not contact:

                     # Maybe we deleted the contact from the roster

                     return

 

             app.gajim_optional_features[a] = []

             app.caps_hash[a] = ''

 

-        self.remote_ctrl = None

-

         # Handle screensaver

         if sys.platform not in ('win32', 'darwin'):

             logind.enable()

 import os

 import base64

 import mimetypes

+import logging

 

 from gi.repository import GLib

 from gi.repository import Gio

 from gajim.common.connection_handlers_events import MessageOutgoingEvent

 from gajim.common.connection_handlers_events import GcMessageOutgoingEvent

 

+log = logging.getLogger('gajim.remote_control')

+

 

 def get_dbus_struct(obj):

     """

         self.raise_signal('VcardInfo', (obj.conn.name, obj.vcard_dict))

 

     def raise_signal(self, event_name, data):

+        log.info('Send event %s', event_name)

         self.con.emit_signal(None,

                              '/org/gajim/dbus/RemoteObject',

                              'org.gajim.dbus.RemoteInterface',

         from gajim import plugins

         app.plugin_manager = plugins.PluginManager()

 

-        self.remote_ctrl = None

         self.instances = {}

         self.minimized_controls = {}

         self.status_sent_to_users = Mock()

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

4 changed files:

Changes: