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

diff --git a/blist_cbs.pxd b/blist_cbs.pxd
index 763cf51..8fba121 100644
--- a/blist_cbs.pxd
+++ b/blist_cbs.pxd
@@ -26,108 +26,106 @@ 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.purple_group_get_name(group)
+    if c_name == NULL:
         name = None
+    else:
+        name = c_name
+
+    currentsize = blist.purple_blist_get_group_size(group, False)
+    totalsize = blist.purple_blist_get_group_size(group, True)
+    online = blist.purple_blist_get_group_online_count(group)
 
-    try:
-        callback(node.type, name, group.totalsize, group.currentsize, \
-                 group.online)
-    except KeyError:
-        pass
+    callback(node.type, name, totalsize, currentsize, online)
 
 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.purple_contact_get_alias(contact)
+    if c_alias == NULL:
         alias = None
+    else:
+        alias = c_alias
 
-    try:
-        callback(node.type, alias, contact.totalsize, contact.currentsize, \
-                 contact.online)
-    except KeyError:
-        pass
+    callback(node.type, alias, contact.totalsize, contact.currentsize, \
+             contact.online)
 
 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.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.purple_buddy_get_alias_only(buddy)
+    if c_alias == NULL:
+        alias = None
     else:
-        name = None
+        alias = c_alias
 
-    try:
-        callback(node.type, name, alias)
-    except KeyError:
-        pass
+    callback(node.type, name, alias)
 
 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.purple_chat_get_name(chat)
+    if c_name == NULL:
+        name = None
     else:
-        alias = None
+        name = c_name
 
-    try:
-        callback(node.type, alias)
-    except KeyError:
-        pass
+    callback(node.type, name)
 
 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:
-        (<object>blist_cbs["new_list"])("new_list")
-    except KeyError:
-        pass
-
-cdef void new_node (blist.PurpleBlistNode *node):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "new_node\n")
-
-    try:
+    callback(node.type)
+
+cdef void new_list(blist.PurpleBuddyList *list):
+    """
+    Sets UI-specific data on a buddy list.
+    """
+    debug.purple_debug_info("blist", "%s", "new-list\n")
+    if blist_cbs.has_key("new-list"):
+        (<object> blist_cbs["new-list"])("new-list: TODO")
+
+cdef void new_node(blist.PurpleBlistNode *node):
+    """
+    Sets UI-specific data on a node.
+    """
+    debug.purple_debug_info("blist", "%s", "new-node\n")
+    if blist_cbs.has_key("new-node"):
         if node.type == blist.PURPLE_BLIST_GROUP_NODE:
-            __group_node_cb(node, blist_cbs["new_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"])
+            __contact_node_cb(node, blist_cbs["new-node"])
         elif node.type == blist.PURPLE_BLIST_BUDDY_NODE:
-            __buddy_node_cb(node, blist_cbs["new_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"])
+            __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")
-    except KeyError:
-        pass
-
-cdef void update (blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "update\n")
-
-    try:
+            __other_node_cb(node, blist_cbs["new-node"])
+
+cdef void show(blist.PurpleBuddyList *list):
+    """
+    The core will call this when it's finished doing its core stuff.
+    """
+    debug.purple_debug_info("blist", "%s", "show\n")
+    if blist_cbs.has_key("show"):
+        (<object> blist_cbs["show"])("show: TODO")
+
+cdef void update(blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
+    """
+    This will update a node in the buddy list.
+    """
+    debug.purple_debug_info("blist", "%s", "update\n")
+    if blist_cbs.has_key("update"):
         if node.type == blist.PURPLE_BLIST_GROUP_NODE:
             __group_node_cb(node, blist_cbs["update"])
         elif node.type == blist.PURPLE_BLIST_CONTACT_NODE:
@@ -138,15 +136,13 @@ 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
-
-cdef void remove (blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "remove\n")
 
-    try:
+cdef void remove(blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
+    """
+    This removes a node from the list.
+    """
+    debug.purple_debug_info("blist", "%s", "remove\n")
+    if blist_cbs.has_key("remove"):
         if node.type == blist.PURPLE_BLIST_GROUP_NODE:
             __group_node_cb(node, blist_cbs["remove"])
         elif node.type == blist.PURPLE_BLIST_CONTACT_NODE:
@@ -157,46 +153,68 @@ 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")
-    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")
-    try:
-        (<object>blist_cbs["set_visible"])("set_visible")
-    except KeyError:
-        pass
-
-cdef void request_add_buddy (account.PurpleAccount *account,
-                             const_char *username, const_char *group,
-                             const_char *alias):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "request_add_buddy\n")
-    try:
-        (<object>blist_cbs["request_add_buddy"])("request_add_buddy")
-    except KeyError:
-        pass
-
-cdef void request_add_chat (account.PurpleAccount *account,
-                            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")
-    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")
-    except KeyError:
-        pass
+
+cdef void destroy(blist.PurpleBuddyList *list):
+    """
+    When the list gets destroyed, this gets called to destroy the UI.
+    """
+    debug.purple_debug_info("blist", "%s", "destroy\n")
+    if blist_cbs.has_key("destroy"):
+        (<object> blist_cbs["destroy"])("destroy: TODO")
+
+cdef void set_visible(blist.PurpleBuddyList *list, glib.gboolean show):
+    """
+    Hides or unhides the buddy list.
+    """
+    debug.purple_debug_info("blist", "%s", "set-visible\n")
+    if blist_cbs.has_key("set-visible"):
+        (<object> blist_cbs["set-visible"])("set-visible: TODO")
+
+cdef void request_add_buddy(account.PurpleAccount *c_account, \
+        const_char *c_buddy_username, const_char *c_buddy_group, \
+        const_char *c_buddy_alias):
+    """
+    Requests from the user information needed to add a buddy to the buddy
+    list.
+    """
+    debug.purple_debug_info("blist", "%s", "request-add-buddy\n")
+
+    username = account.purple_account_get_username(c_account)
+    protocol_id = account.purple_account_get_protocol_id(c_account)
+
+    if c_buddy_username:
+        buddy_username = <char *> c_buddy_username
+    else:
+        buddy_username = None
+
+    if c_buddy_group:
+        buddy_group = <char *> c_buddy_group
+    else:
+        buddy_group = None
+
+    if c_buddy_alias:
+        buddy_alias = <char *> c_buddy_alias
+    else:
+        buddy_alias = None
+
+    if blist_cbs.has_key("request-add-buddy"):
+        (<object> blist_cbs["request-add-buddy"])( \
+                (username, protocol_id), \
+                buddy_username, buddy_group, buddy_alias)
+
+cdef void request_add_chat(account.PurpleAccount *acc, \
+        blist.PurpleGroup *group, const_char *alias, const_char *name):
+    """
+    TODO
+    """
+    debug.purple_debug_info("blist", "%s", "request-add-chat\n")
+    if blist_cbs.has_key("request-add-chat"):
+        (<object> blist_cbs["request-add-chat"])("request-add-chat: TODO")
+
+cdef void request_add_group():
+    """
+    TODO
+    """
+    debug.purple_debug_info("blist", "%s", "request-add-group\n")
+    if blist_cbs.has_key("request-add-chat"):
+        (<object>blist_cbs["request-add-chat"])("request-add-group: TODO")