Add support to new callback class

[python-purple] / blist_cbs.pxd

diff --git a/blist_cbs.pxd b/blist_cbs.pxd
index 96268a4..c1830d6 100644 (file)
--- a/blist_cbs.pxd
+++ b/blist_cbs.pxd
@@ -30,7 +30,7 @@ cdef void __group_node_cb(blist.PurpleBlistNode *node, object callback):
     if group.name:
         name = group.name
     else:
-        name = None
+        name = ""
 
     try:
         callback(node.type, name, group.totalsize, group.currentsize, \
@@ -44,10 +44,12 @@ cdef void __contact_node_cb(blist.PurpleBlistNode *node, object callback):
     if contact.alias:
         alias = contact.alias
     else:
-        alias = None
+        alias = ""
+
+    name = ""
 
     try:
-        callback(node.type, alias, contact.totalsize, contact.currentsize, \
+        callback(node.type, name, alias, contact.totalsize, contact.currentsize, \
                  contact.online)
     except KeyError:
         pass
@@ -60,12 +62,12 @@ cdef void __buddy_node_cb(blist.PurpleBlistNode *node, object callback):
     elif buddy.alias:
         alias = buddy.alias
     else:
-        alias = None
+        alias = ""
 
     if buddy.name:
         name = buddy.name
     else:
-        name = None
+        name = ""
 
     try:
         callback(node.type, name, alias)
@@ -78,7 +80,7 @@ cdef void __chat_node_cb(blist.PurpleBlistNode *node, object callback):
     if chat.alias:
         alias = chat.alias
     else:
-        alias = None
+        alias = ""
 
     try:
         callback(node.type, alias)
@@ -101,21 +103,21 @@ 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")
 
-    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"])
-    else:
-        try:
+    try:
+        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"])
+        else:
             (<object>blist_cbs["new_node"])(node.type)
-        except KeyError:
-            pass
+    except KeyError:
+        pass
 
 cdef void show (blist.PurpleBuddyList *list):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "show\n")
@@ -127,40 +129,40 @@ 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")
 
-    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"])
-    else:
-        try:
+    try:
+        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"])
+        else:
             (<object>blist_cbs["update"])(node.type)
-        except KeyError:
-            pass
+    except KeyError:
+        pass
 
 cdef void remove (blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "remove\n")
 
-    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"])
-    else:
-        try:
+    try:
+        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"])
+        else:
             (<object>blist_cbs["remove"])(node.type)
-        except KeyError:
-            pass
+    except KeyError:
+        pass
 
 cdef void destroy (blist.PurpleBuddyList *list):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "destroy\n")