X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=nullclient-ecore.py;h=50e21a06640688b36043a65bf91a97d9ebf11364;hp=72cc6554d707abcf033a66659e74da4ba33de21b;hb=445c387d8067391f329186a13ce482dbb3c64c80;hpb=2bfa6c6897898733546439b42a20da25f3f8a62f
diff --git a/nullclient-ecore.py b/nullclient-ecore.py
index 72cc655..50e21a0 100644
--- a/nullclient-ecore.py
+++ b/nullclient-ecore.py
@@ -3,8 +3,6 @@ import ecore
import purple
cbs = {}
-acc_cbs = {}
-blist_cbs = {}
conn_cbs = {}
conv_cbs = {}
notify_cbs = {}
@@ -16,19 +14,6 @@ def account_callback(name):
def blist_callback(name):
print "---- blist callback example: %s" % name
-#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
-#blist_cbs["destroy"] = blist_callback
-blist_cbs["set_visible"] = blist_callback
-blist_cbs["request_add_buddy"] = blist_callback
-blist_cbs["request_add_chat"] = blist_callback
-blist_cbs["request_add_group"] = blist_callback
-
-cbs["blist"] = blist_cbs
-
def conn_callback(name):
print "---- connection callback example: %s" % name
@@ -250,12 +235,11 @@ class MainWindow:
if callable(cb):
self.quit_cb = cb
- def _write_im_cb(self, name, who, message):
- if who:
- w = who.split("/")[0]
- self.txt_area.text += w + ": " + str(message) + "
"
+ def _write_im_cb(self, sender, alias, message):
+ if alias:
+ self.txt_area.text += alias + ": " + message + "
"
else:
- self.txt_area.text += str(name) + ": " + str(message) + "
"
+ self.txt_area.text += sender + ": " + message + "
"
self._window.show_all()
@@ -266,10 +250,9 @@ class NullClientPurple:
self.buddies = {} #all buddies
self.conversations = {}
self.protocol_id = "prpl-jabber"
+ self.account = None
self.accs = None
- global cbs
- cbs["blist"]["update"] = self._purple_update_blist_cb
self.p.add_account_cb("notify_added", account_callback)
self.p.add_account_cb("status_changed", account_callback)
@@ -277,6 +260,12 @@ class NullClientPurple:
self.p.add_account_cb("request_authorize", account_callback)
self.p.add_account_cb("close_account_request", account_callback)
+ self.p.add_blist_cb("set_visible", blist_callback)
+ self.p.add_blist_cb("request_add_buddy", blist_callback)
+ self.p.add_blist_cb("request_add_chat", blist_callback)
+ self.p.add_blist_cb("request_add_group", blist_callback)
+ self.p.add_blist_cb("update", self._purple_update_blist_cb)
+
self.p.purple_init(cbs)
#Initializing UI
@@ -285,9 +274,10 @@ class NullClientPurple:
self.window.add_account_cb(self.add_account)
self.window.init_window()
- def _purple_update_blist_cb(self, type, name=None, alias=None, totalsize=None,\
- currentsize=None, online=None):
- if type == 2:
+ def _purple_update_blist_cb(self, type, name=None, alias=None, \
+ totalsize=None, currentsize=None, \
+ online=None):
+ if self.account and name != None and type == 2:
if not self.buddies.has_key(name):
b = purple.Buddy()
b.new_buddy(self.account, name, alias)
@@ -295,12 +285,12 @@ class NullClientPurple:
elif self.buddies[name].online:
self.window.new_buddy(name)
- def _purple_signal_sign_off_cb(self, name, bname):
- if self.buddies.has_key(bname):
- self.buddies[bname] = None
- self.buddies.pop(bname)
+ def _purple_signal_buddy_signed_off_cb(self, name, alias):
+ if self.buddies.has_key(name):
+ self.buddies[name] = None
+ self.buddies.pop(name)
print "[DEBUG]: Buddy removed!"
- self.window.remove_buddy(bname)
+ self.window.remove_buddy(name)
def _purple_create_conv_cb(self, name, type):
bname = name.split("/")[0]
@@ -317,7 +307,7 @@ class NullClientPurple:
self.account.set_enabled("carman-purple-python", True)
self.account.password = password
self.p.connect()
- self.p.signal_connect("buddy-signed-off", self._purple_signal_sign_off_cb)
+ self.p.signal_connect("buddy-signed-off", self._purple_signal_buddy_signed_off_cb)
def add_account(self):
username = "carmanplugintest@gmail.com"