[PATCH] Patch for the dbus plugin

[Ivan!]

Hi

I'm developing an helper for docky, that changes emesene icon according to emesene status.
And to do this, i used dbus to comunicate (docky-emesene), i needed a little change to dbus plugin (there weren't 2 things: get emesene status, and a signal on status change)...

So i made a little patch, i hope this will go into the svn ^^

Code:

Index: plugins_base/Dbus.py
===================================================================
--- plugins_base/Dbus.py (revisione 2255)
+++ plugins_base/Dbus.py (copia locale)
@@ -58,6 +58,7 @@
         self.user_offline_id = None
         self.self_nick_changed_id = None
         self.psm_changed_id = None
+        self.status_changed_id = None
 
         self.dbus_object = None
 
@@ -71,6 +72,8 @@
                                                   self.self_nick_changed)
         self.psm_changed_id = self.connect('personal-message-changed',
                                             self.psm_changed)
+        self.status_changed_id = self.connect('self-status-changed',
+                                            self.status_changed)
 
         self.enabled = True
 
@@ -80,6 +83,7 @@
         self.disconnect( self.user_offline_id )
         self.disconnect( self.self_nick_changed_id )
         self.disconnect( self.psm_changed_id )
+        self.disconnect( self.status_changed_id )
 
         self.destroy_dbus_session()
 
@@ -122,6 +126,10 @@
         if(oldStatus=='FLN'):
             self.dbus_object.user_connect(user)
 
+    def status_changed(self, msnp, status):
+        newstatus = self.controller.contacts.get_status()
+        self.dbus_object.status_changed('', newstatus)
+
     def user_offline(self, msnp, user):
         self.dbus_object.user_offline(user)
 
@@ -142,6 +150,11 @@
 
         #Methods
         @dbus.service.method(BUS_NAME)
+        def get_status(self):
+            return self.controller.contacts.get_status()
+
+
+        @dbus.service.method(BUS_NAME)
         def set_psm(self, text):
             self.contact_manager.set_message(text)
             return 'Psm Changed'
@@ -267,5 +280,10 @@
         @dbus.service.signal(BUS_NAME)
         def psm_changed(self, email, pm):
             pass
+
+        @dbus.service.signal(BUS_NAME)
+        def status_changed(self, email, status):
+            pass
+
 except Exception, e:
     dbusError = e

preview  

[cando]

very nice man!!!!!!

[C10uD]

thank you, will land in svn asap

[ukblacknight]

Hey dude, I've also been working on a helper, but with a different functionality of showing an unread message counter badge!  I also needed some patches applied to the dbus, so once yours has made it I'll submit mine and we can merge our helper files so it has both functionalities?

[C10uD]

i already committed his patch iirc

[Ivan!]

Hey dude, I've also been working on a helper, but with a different functionality of showing an unread message counter badge!  I also needed some patches applied to the dbus, so once yours has made it I'll submit mine and we can merge our helper files so it has both functionalities?

maybe we can, but my helper for now won't be added to docky (because it works only with a svn version), so for now you can make a separate helper and it will be included in docky


btw, this is my helper
https://bugs.launchpad.net/docky/+bug/524645
(use with svn version, and create a folder called emesene_theme with 5 pngs [online.png, idle.png, away.png, hidden.png, busy.png] in the ~/.local/share/docky/helpers folder)

[ukblacknight]

Cool Mine is working off the PPA version, although it's requiring a bit of DBus hacking and I still haven't got it fully working yet, it should be ready tonight I reckon   I'll see if I can get my changes applied and then submit the helper to launchpad.

[ukblacknight]

Ok so here is my patch from the latest svn, adding to the work that Ivan! did.  Please check over it as I had a slight hic-up on my end of things, however I believe that the diff file is fine.

The patch will allow the emesene docky helper to work   If there are problems with the patch, please let me know!

[hit^]

Code:

Traceback (most recent call last):

  File "/home/hit/Apps/emesene/plugins_base/Dbus.py", line 161, in message_read
    self.dbus_object.set_message_count(0)

AttributeError: 'NoneType' object has no attribute 'set_message_count'

Connection was lost and some conversations were open..

[ukblacknight]

Yeah I get that sometimes too.  I'm currently looking into it, but difficult to test!

[hit^]

Now I disconnected from msn, then unplugged the cable and still got this exception.

[ukblacknight]

Think I found the problem - seems to have fixed it on my end anyway.  Test away

[Ivan!]

Since some updates the dbus plugin is not able to retrieve the status correctly...
I don't know the source of this error, because none of the previous rev (of Dbus.py) changed my lines... boh...

btw this is a fix...
this is the (very small) patch:

Code:

Index: plugins_base/Dbus.py
===================================================================
--- plugins_base/Dbus.py (revisione 2340)
+++ plugins_base/Dbus.py (copia locale)
@@ -162,7 +162,7 @@
         if self.dbus_object == None:
             self.start_dbus()
             
-        newstatus = self.controller.contacts.get_status()
+        newstatus = self.msn.status
         self.dbus_object.status_changed('', newstatus)
 
     def user_offline(self, msnp, user):
@@ -222,7 +222,7 @@
         #Methods
         @dbus.service.method(BUS_NAME)
         def get_status(self):
-            return self.controller.contacts.get_status()
+            return self.msn.status
 
         @dbus.service.method(BUS_NAME)
         def show(self):

=)

[arielj]

ok, applied, thanks!