X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=blist_cbs.pxd;h=2e535a2df41ba26050bd3dfa6e0c67be05ebf1f3;hp=803c0ebb16cfdeff50b2a17e6a1567bf5b9fac3e;hb=dd446d6d03c2c550010993a4e949007c242ecbe7;hpb=c91fe1b6caf0ae1339fba5435b70d27fcffbe5fa

diff --git a/blist_cbs.pxd b/blist_cbs.pxd
index 803c0eb..2e535a2 100644
--- a/blist_cbs.pxd
+++ b/blist_cbs.pxd
@@ -24,6 +24,73 @@ cdef extern from *:
 
 blist_cbs = {}
 
+cdef void __group_node_cb(blist.PurpleBlistNode *node, object callback):
+    cdef blist.PurpleGroup *group = <blist.PurpleGroup *>node
+    cdef char *name = NULL
+
+    name = <char *> blist.c_purple_group_get_name(group)
+    if name == NULL:
+        name = ""
+
+    currentsize = blist.c_purple_blist_get_group_size(group, False)
+    totalsize = blist.c_purple_blist_get_group_size(group, True)
+    online = blist.c_purple_blist_get_group_online_count(group)
+
+    try:
+        callback(node.type, name, totalsize, currentsize, online)
+    except KeyError:
+        pass
+
+cdef void __contact_node_cb(blist.PurpleBlistNode *node, object callback):
+    cdef blist.PurpleContact *contact = <blist.PurpleContact *>node
+    cdef char *alias = NULL
+
+    alias = <char *> blist.c_purple_contact_get_alias(contact)
+    if alias == NULL:
+        alias = ""
+
+    try:
+        callback(node.type, alias, contact.totalsize, contact.currentsize, \
+                 contact.online)
+    except KeyError:
+        pass
+
+cdef void __buddy_node_cb(blist.PurpleBlistNode *node, object callback):
+    cdef blist.PurpleBuddy *buddy = <blist.PurpleBuddy *>node
+    cdef char *name = NULL
+    cdef char *alias = NULL
+
+    name = <char *> blist.c_purple_buddy_get_name(buddy)
+    if name == NULL:
+        name = ""
+    alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+    if alias == NULL:
+        alias = ""
+
+    try:
+        callback(node.type, name, alias)
+    except KeyError:
+        pass
+
+cdef void __chat_node_cb(blist.PurpleBlistNode *node, object callback):
+    cdef blist.PurpleChat *chat = <blist.PurpleChat *>node
+    cdef char *name = NULL
+
+    name = <char *> blist.c_purple_chat_get_name(chat)
+    if name == NULL:
+        name = ""
+
+    try:
+        callback(node.type, name)
+    except KeyError:
+        pass
+
+cdef void __other_node_cb(blist.PurpleBlistNode *node, object callback):
+    try:
+        callback(node.type)
+    except KeyError:
+        pass
+
 cdef void new_list (blist.PurpleBuddyList *list):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "new_list\n")
     try:
@@ -34,7 +101,16 @@ cdef void new_list (blist.PurpleBuddyList *list):
 cdef void new_node (blist.PurpleBlistNode *node):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "new_node\n")
     try:
-        (<object>blist_cbs["new_node"])("new_node")
+        if node.type == blist.PURPLE_BLIST_GROUP_NODE:
+            __group_node_cb(node, blist_cbs["new_node"])
+        elif node.type == blist.PURPLE_BLIST_CONTACT_NODE:
+            __contact_node_cb(node, blist_cbs["new_node"])
+        elif node.type == blist.PURPLE_BLIST_BUDDY_NODE:
+            __buddy_node_cb(node, blist_cbs["new_node"])
+        elif node.type == blist.PURPLE_BLIST_CHAT_NODE:
+            __chat_node_cb(node, blist_cbs["new_node"])
+        elif node.type == blist.PURPLE_BLIST_OTHER_NODE:
+            __other_node_cb(node, blist_cbs["new_node"])
     except KeyError:
         pass
 
@@ -48,14 +124,33 @@ cdef void show (blist.PurpleBuddyList *list):
 cdef void update (blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "update\n")
     try:
-        (<object>blist_cbs["update"])("update")
+        if node.type == blist.PURPLE_BLIST_GROUP_NODE:
+            __group_node_cb(node, blist_cbs["update"])
+        elif node.type == blist.PURPLE_BLIST_CONTACT_NODE:
+            __contact_node_cb(node, blist_cbs["update"])
+        elif node.type == blist.PURPLE_BLIST_BUDDY_NODE:
+            __buddy_node_cb(node, blist_cbs["update"])
+        elif node.type == blist.PURPLE_BLIST_CHAT_NODE:
+            __chat_node_cb(node, blist_cbs["update"])
+        elif node.type == blist.PURPLE_BLIST_OTHER_NODE:
+            __other_node_cb(node, blist_cbs["update"])
     except KeyError:
         pass
 
 cdef void remove (blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "remove\n")
+
     try:
-        (<object>blist_cbs["remove"])("remove")
+        if node.type == blist.PURPLE_BLIST_GROUP_NODE:
+            __group_node_cb(node, blist_cbs["remove"])
+        elif node.type == blist.PURPLE_BLIST_CONTACT_NODE:
+            __contact_node_cb(node, blist_cbs["remove"])
+        elif node.type == blist.PURPLE_BLIST_BUDDY_NODE:
+            __buddy_node_cb(node, blist_cbs["remove"])
+        elif node.type == blist.PURPLE_BLIST_CHAT_NODE:
+            __chat_node_cb(node, blist_cbs["remove"])
+        elif node.type == blist.PURPLE_BLIST_OTHER_NODE:
+            __other_node_cb(node, blist_cbs["remove"])
     except KeyError:
         pass
 
@@ -73,7 +168,7 @@ cdef void set_visible (blist.PurpleBuddyList *list, glib.gboolean show):
     except KeyError:
         pass
 
-cdef void request_add_buddy (account.PurpleAccount *account,
+cdef void request_add_buddy (account.PurpleAccount *acc,
                              const_char *username, const_char *group,
                              const_char *alias):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "request_add_buddy\n")
@@ -82,7 +177,7 @@ cdef void request_add_buddy (account.PurpleAccount *account,
     except KeyError:
         pass
 
-cdef void request_add_chat (account.PurpleAccount *account,
+cdef void request_add_chat (account.PurpleAccount *acc,
                             blist.PurpleGroup *group, const_char *alias,
                             const_char *name):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "request_add_chat\n")