X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=nullclient-ecore.py;h=f2e9dd91d92496ce40e551204e2c88604852c129;hp=9e2c369f9fccf5e15077e94221955b2e17e918ee;hb=6545aaed50154028f8e6fbac3cd08c972940cb40;hpb=47eee11c8d110ae4ceb59358a8021d923f285925

diff --git a/nullclient-ecore.py b/nullclient-ecore.py
index 9e2c369..f2e9dd9 100644
--- a/nullclient-ecore.py
+++ b/nullclient-ecore.py
@@ -25,8 +25,8 @@ cbs["account"] = acc_cbs
 def blist_callback(name):
     print "---- blist callback example: %s" % name
 
-blist_cbs["new_list"] = blist_callback
-blist_cbs["new_node"] = blist_callback
+#blist_cbs["new_list"] = blist_callback
+#blist_cbs["new_node"] = blist_callback
 blist_cbs["show"] = blist_callback
 #blist_cbs["update"] = blist_callback
 blist_cbs["remove"] = blist_callback
@@ -61,7 +61,6 @@ def conv_callback(name):
 conv_cbs["create_conversation"] = conv_callback
 conv_cbs["destroy_conversation"] = conv_callback
 conv_cbs["write_chat"] = conv_callback
-conv_cbs["write_im"] = conv_callback
 conv_cbs["write_conv"] = conv_callback
 conv_cbs["chat_add_users"] = conv_callback
 conv_cbs["chat_rename_user"] = conv_callback
@@ -104,21 +103,23 @@ request_cbs["request_folder"] = request_callback
 
 cbs["request"] = request_cbs
 
-def buddy_signed_off_cb(name):
-    print "---- sign off from buddy %s" % name
+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["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
         self.bt_cbs = {}
         self.quit_cb = quit_cb
+        conv_cbs["write_im"] = self._write_im_cb
 
     def init_window(self):
         # Main vbox
@@ -149,6 +150,8 @@ class MainWindow:
 
         vbox_txt_area = etk.VBox()
         self.txt_area = etk.Label()
+        self.txt_area.text = "<br> "
+
         vbox_txt_area.append(self.txt_area, etk.VBox.START, etk.VBox.EXPAND_FILL, 0)
 
         hbox_panel.append(vbox_txt_area, etk.HBox.START, etk.HBox.EXPAND_FILL, 0)
@@ -191,6 +194,9 @@ class MainWindow:
             if [b] not in self.blistmodel.elements:
                 self.blistmodel.append([b])
 
+    def remove_buddy(self, bname):
+        self.blistmodel.remove([bname])
+
     def _purple_disconnected_status_cb(self, pointer):
         self.lstatus.text = "Disconnected"
 
@@ -205,42 +211,46 @@ 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> "
+        self._window.show_all()
+
 
 class NullClientPurple:
     def __init__(self):
         self.p = purple.Purple(debug_enabled=False)
         self.window = MainWindow(self.quit)
-        self.buddies = []
+        self.buddies = [] #online buddies
         self.account = None
-        self.protocol = None
+        self.protocol_id = "prpl-jabber"
         self.username = "carmanplugintest@gmail.com"
         self.password = "abc123def"
 
+
         global cbs
-        cbs["blist"]["update"] = self._purple_blist_new_cb
+        global signal_cbs
+        cbs["blist"]["update"] = self._purple_update_blist_cb
+        signal_cbs["buddy_signed_off"] = self._purple_signal_sign_off_cb
         self.p.purple_init(cbs)
 
         #Initializing UI
         self.window.add_bt_conn_cb(self.connect)
         self.window.init_window()
 
-    def _purple_blist_new_cb(self, pointer):
-        """ FIXME: Hack! to fill blist on UI """
-        buddies = self.account.get_buddies_online()
-        for i in buddies:
-            if i not in self.buddies:
-                self.buddies.append(i)
-                self.window.new_buddy(i)
+    def _purple_update_blist_cb(self, type, name=None, totalsize=None,\
+                             currentsize=None, online=None):
+        self.buddies = self.account.get_buddies_online()
+        if type == 2:
+            if name in self.buddies:
+                self.buddies.append(name)
+                self.window.new_buddy(name)
 
-    def set_protocol(self, protocol):
-        for p in self.p.get_protocols():
-            if p.get_name() == protocol:
-                self.protocol = p
-                return
+    def _purple_signal_sign_off_cb(self, name, bname):
+        self.buddies.remove(bname)
+        self.window.remove_buddy(bname)
 
     def connect(self):
-        self.set_protocol("XMPP")
-        self.account = purple.Account(self.username, self.protocol.get_id())
+        self.account = purple.Account(self.username, self.protocol_id)
         self.account.set_password(self.password)
 
         self.account.proxy.set_type(purple.ProxyInfoType().HTTP)
@@ -261,4 +271,4 @@ class NullClientPurple:
 if __name__ == '__main__':
 
     nullpurple = NullClientPurple()
-    ecore.main_loop_begin()
\ No newline at end of file
+    ecore.main_loop_begin()