Conversation: who added

[python-purple] / nullclient-ecore.py

diff --git a/nullclient-ecore.py b/nullclient-ecore.py
index 94d8f92..cd99eec 100644 (file)
--- a/nullclient-ecore.py
+++ b/nullclient-ecore.py
@@ -9,7 +9,6 @@ conn_cbs = {}
 conv_cbs = {}
 notify_cbs = {}
 request_cbs = {}
-signal_cbs = {}
 
 def account_callback(name):
     print "---- account callback example: %s" % name
@@ -104,17 +103,6 @@ request_cbs["request_folder"] = request_callback
 
 cbs["request"] = request_cbs
 
-def buddy_signed_off_cb(name, bname):
-    print "---- sign off from buddy %s" % bname
-
-def receiving_im_msg_cb(sender, name, message):
-    print "---- receiving IM message from %s: %s" % (name, message)
-    return False
-
-#signal_cbs["buddy_signed_off"] = buddy_signed_off_cb
-signal_cbs["receiving_im_msg"] = receiving_im_msg_cb
-
-
 class MainWindow:
     def __init__(self, quit_cb):
         global conv_cbs
@@ -223,8 +211,12 @@ class MainWindow:
         if callable(cb):
             self.quit_cb = cb
 
-    def _write_im_cb(self, name, message):
-        self.txt_area.text +=  str(name) + ": " + str(message) + "<br> "
+    def _write_im_cb(self, name, who, message):
+        if who:
+            w = who.split("/")[0]
+            self.txt_area.text +=  w + ": " + str(message) + "<br> "
+        else:
+            self.txt_area.text += str(name) + ": " + str(message) + "<br> "
         self._window.show_all()
 
 
@@ -239,12 +231,8 @@ class NullClientPurple:
         self.username = "carmanplugintest@gmail.com"
         self.password = "abc123def"
 
-
         global cbs
-        global signal_cbs
         cbs["blist"]["update"] = self._purple_update_blist_cb
-        signal_cbs["buddy_signed_off"] = self._purple_signal_sign_off_cb
-        cbs["conversation"]["create_conversation"] = self._purple_create_conv_cb
         self.p.purple_init(cbs)
 
         #Initializing UI
@@ -283,7 +271,7 @@ class NullClientPurple:
 
         self.account.set_enabled("carman-purple-python", True)
         self.p.connect()
-        self.p.attach_signals(signal_cbs)
+        self.p.signal_connect("buddy-signed-off", self._purple_signal_sign_off_cb)
 
     def send_msg(self, name, msg):
         if not self.conversations.has_key(name):