X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=blist_cbs.pxd;h=52847dcca9f8b310e2c62e4c31703917069aa8de;hp=763cf51a160fa72aaff01e75aac297b604f8378c;hb=2491093a6b435f34eb5ba929ec404bf2aee87709;hpb=8a65818786ccf9442ed68927ddb9922465a424b4

diff --git a/blist_cbs.pxd b/blist_cbs.pxd
index 763cf51..52847dc 100644
--- a/blist_cbs.pxd
+++ b/blist_cbs.pxd
@@ -26,25 +26,32 @@ blist_cbs = {}
 
 cdef void __group_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef blist.PurpleGroup *group = <blist.PurpleGroup *>node
+    cdef char *c_name = NULL
 
-    if group.name:
-        name = group.name
-    else:
+    c_name = <char *> blist.c_purple_group_get_name(group)
+    if c_name == NULL:
         name = None
+    else:
+        name = c_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, group.totalsize, group.currentsize, \
-                 group.online)
+        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 *c_alias = NULL
 
-    if contact.alias:
-        alias = contact.alias
-    else:
+    c_alias = <char *> blist.c_purple_contact_get_alias(contact)
+    if c_alias == NULL:
         alias = None
+    else:
+        alias = c_alias
 
     try:
         callback(node.type, alias, contact.totalsize, contact.currentsize, \
@@ -54,18 +61,20 @@ cdef void __contact_node_cb(blist.PurpleBlistNode *node, object callback):
 
 cdef void __buddy_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef blist.PurpleBuddy *buddy = <blist.PurpleBuddy *>node
+    cdef char *c_name = NULL
+    cdef char *c_alias = NULL
 
-    if buddy.server_alias:
-        alias = buddy.server_alias
-    elif buddy.alias:
-        alias = buddy.alias
+    c_name = <char *> blist.c_purple_buddy_get_name(buddy)
+    if c_name == NULL:
+        name = None
     else:
-        alias = None
+        name = c_name
 
-    if buddy.name:
-        name = buddy.name
+    c_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+    if c_alias == NULL:
+        alias = None
     else:
-        name = None
+        alias = c_alias
 
     try:
         callback(node.type, name, alias)
@@ -74,14 +83,16 @@ cdef void __buddy_node_cb(blist.PurpleBlistNode *node, object callback):
 
 cdef void __chat_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef blist.PurpleChat *chat = <blist.PurpleChat *>node
+    cdef char *c_name = NULL
 
-    if chat.alias:
-        alias = chat.alias
+    c_name = <char *> blist.c_purple_chat_get_name(chat)
+    if c_name == NULL:
+        name = None
     else:
-        alias = None
+        name = c_name
 
     try:
-        callback(node.type, alias)
+        callback(node.type, name)
     except KeyError:
         pass
 
@@ -100,7 +111,6 @@ 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:
         if node.type == blist.PURPLE_BLIST_GROUP_NODE:
             __group_node_cb(node, blist_cbs["new_node"])
@@ -112,21 +122,18 @@ cdef void new_node (blist.PurpleBlistNode *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"])
-        else:
-            (<object>blist_cbs["new_node"])(node.type)
     except KeyError:
         pass
 
 cdef void show (blist.PurpleBuddyList *list):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "show\n")
     try:
-        (<object>blist_cbs["show"])("show")
+        (<object>blist_cbs["show"])("show: TODO")
     except KeyError:
         pass
 
 cdef void update (blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "update\n")
-
     try:
         if node.type == blist.PURPLE_BLIST_GROUP_NODE:
             __group_node_cb(node, blist_cbs["update"])
@@ -138,8 +145,6 @@ cdef void update (blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
             __chat_node_cb(node, blist_cbs["update"])
         elif node.type == blist.PURPLE_BLIST_OTHER_NODE:
             __other_node_cb(node, blist_cbs["update"])
-        else:
-            (<object>blist_cbs["update"])(node.type)
     except KeyError:
         pass
 
@@ -157,46 +162,44 @@ cdef void remove (blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
             __chat_node_cb(node, blist_cbs["remove"])
         elif node.type == blist.PURPLE_BLIST_OTHER_NODE:
             __other_node_cb(node, blist_cbs["remove"])
-        else:
-            (<object>blist_cbs["remove"])(node.type)
     except KeyError:
         pass
 
 cdef void destroy (blist.PurpleBuddyList *list):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "destroy\n")
     try:
-        (<object>blist_cbs["destroy"])("destroy")
+        (<object>blist_cbs["destroy"])("destroy: TODO")
     except KeyError:
         pass
 
 cdef void set_visible (blist.PurpleBuddyList *list, glib.gboolean show):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "set_visible\n")
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "set-visible\n")
     try:
-        (<object>blist_cbs["set_visible"])("set_visible")
+        (<object>blist_cbs["set_visible"])("set-visible: TODO")
     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")
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "request-add-buddy\n")
     try:
-        (<object>blist_cbs["request_add_buddy"])("request_add_buddy")
+        (<object>blist_cbs["request-add-buddy"])("request-add-buddy: TODO")
     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")
     try:
-        (<object>blist_cbs["request_add_chat"])("request_add_chat")
+        (<object>blist_cbs["request-add-chat"])("request-add-chat: TODO")
     except KeyError:
         pass
 
 cdef void request_add_group ():
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "request_add_group\n")
     try:
-        (<object>blist_cbs["request_add_chat"])("request_add_group")
+        (<object>blist_cbs["request-add-chat"])("request-add-group: TODO")
     except KeyError:
         pass