Deleting plugin.pyx

[python-purple] / nullclient-ecore.py

diff --git a/nullclient-ecore.py b/nullclient-ecore.py
index 207d42d..f2e9dd9 100644 (file)
--- 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
@@ -220,16 +220,16 @@ 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
         global signal_cbs
-        cbs["blist"]["update"] = self._purple_blist_new_cb
+        cbs["blist"]["update"] = self._purple_update_blist_cb
         signal_cbs["buddy_signed_off"] = self._purple_signal_sign_off_cb
         self.p.purple_init(cbs)
 
@@ -237,27 +237,20 @@ class NullClientPurple:
         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 _purple_signal_sign_off_cb(self, name, bname):
         self.buddies.remove(bname)
         self.window.remove_buddy(bname)
 
-    def set_protocol(self, protocol):
-        for p in self.p.get_protocols():
-            if p.get_name() == protocol:
-                self.protocol = p
-                return
-
     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)