Removed ecore necessity from python-purple.

[python-purple] / blist_cbs.pxd

diff --git a/blist_cbs.pxd b/blist_cbs.pxd
index 7031426..fc587e5 100644 (file)
--- a/blist_cbs.pxd
+++ b/blist_cbs.pxd
@@ -28,15 +28,15 @@ cdef void __group_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef blist.PurpleGroup *group = <blist.PurpleGroup *>node
     cdef char *c_name = NULL
 
-    c_name = <char *> blist.c_purple_group_get_name(group)
+    c_name = <char *> blist.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)
+    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)
 
     callback(node.type, name, totalsize, currentsize, online)
 
@@ -44,7 +44,7 @@ cdef void __contact_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef blist.PurpleContact *contact = <blist.PurpleContact *>node
     cdef char *c_alias = NULL
 
-    c_alias = <char *> blist.c_purple_contact_get_alias(contact)
+    c_alias = <char *> blist.purple_contact_get_alias(contact)
     if c_alias == NULL:
         alias = None
     else:
@@ -58,13 +58,13 @@ cdef void __buddy_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef char *c_name = NULL
     cdef char *c_alias = NULL
 
-    c_name = <char *> blist.c_purple_buddy_get_name(buddy)
+    c_name = <char *> blist.purple_buddy_get_name(buddy)
     if c_name == NULL:
         name = None
     else:
         name = c_name
 
-    c_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+    c_alias = <char *> blist.purple_buddy_get_alias_only(buddy)
     if c_alias == NULL:
         alias = None
     else:
@@ -76,7 +76,7 @@ cdef void __chat_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef blist.PurpleChat *chat = <blist.PurpleChat *>node
     cdef char *c_name = NULL
 
-    c_name = <char *> blist.c_purple_chat_get_name(chat)
+    c_name = <char *> blist.purple_chat_get_name(chat)
     if c_name == NULL:
         name = None
     else:
@@ -91,16 +91,16 @@ cdef void new_list(blist.PurpleBuddyList *list):
     """
     Sets UI-specific data on a buddy list.
     """
-    debug.c_purple_debug_info("blist", "%s", "new-list\n")
-    if blist_cbs.has_key("new-list"):
+    debug.purple_debug_info("blist", "%s", "new-list\n")
+    if "new-list" in blist_cbs:
         (<object> blist_cbs["new-list"])("new-list: TODO")
 
 cdef void new_node(blist.PurpleBlistNode *node):
     """
     Sets UI-specific data on a node.
     """
-    debug.c_purple_debug_info("blist", "%s", "new-node\n")
-    if blist_cbs.has_key("new-node"):
+    debug.purple_debug_info("blist", "%s", "new-node\n")
+    if "new-node" in blist_cbs:
         if node.type == blist.PURPLE_BLIST_GROUP_NODE:
             __group_node_cb(node, blist_cbs["new-node"])
         elif node.type == blist.PURPLE_BLIST_CONTACT_NODE:
@@ -116,16 +116,16 @@ cdef void show(blist.PurpleBuddyList *list):
     """
     The core will call this when it's finished doing its core stuff.
     """
-    debug.c_purple_debug_info("blist", "%s", "show\n")
-    if blist_cbs.has_key("show"):
+    debug.purple_debug_info("blist", "%s", "show\n")
+    if "show" in blist_cbs:
         (<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.c_purple_debug_info("blist", "%s", "update\n")
-    if blist_cbs.has_key("update"):
+    debug.purple_debug_info("blist", "%s", "update\n")
+    if "update" in blist_cbs:
         if node.type == blist.PURPLE_BLIST_GROUP_NODE:
             __group_node_cb(node, blist_cbs["update"])
         elif node.type == blist.PURPLE_BLIST_CONTACT_NODE:
@@ -141,8 +141,8 @@ cdef void remove(blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
     """
     This removes a node from the list.
     """
-    debug.c_purple_debug_info("blist", "%s", "remove\n")
-    if blist_cbs.has_key("remove"):
+    debug.purple_debug_info("blist", "%s", "remove\n")
+    if "remove" in blist_cbs:
         if node.type == blist.PURPLE_BLIST_GROUP_NODE:
             __group_node_cb(node, blist_cbs["remove"])
         elif node.type == blist.PURPLE_BLIST_CONTACT_NODE:
@@ -158,40 +158,62 @@ cdef void destroy(blist.PurpleBuddyList *list):
     """
     When the list gets destroyed, this gets called to destroy the UI.
     """
-    debug.c_purple_debug_info("blist", "%s", "destroy\n")
-    if blist_cbs.has_key("destroy"):
+    debug.purple_debug_info("blist", "%s", "destroy\n")
+    if "destroy" in blist_cbs:
         (<object> blist_cbs["destroy"])("destroy: TODO")
 
 cdef void set_visible(blist.PurpleBuddyList *list, glib.gboolean show):
     """
     Hides or unhides the buddy list.
     """
-    debug.c_purple_debug_info("blist", "%s", "set-visible\n")
-    if blist_cbs.has_key("set-visible"):
+    debug.purple_debug_info("blist", "%s", "set-visible\n")
+    if "set-visible" in blist_cbs:
         (<object> blist_cbs["set-visible"])("set-visible: TODO")
 
-cdef void request_add_buddy(account.PurpleAccount *acc, \
-        const_char *username, const_char *group, const_char *alias):
+cdef void request_add_buddy(account.PurpleAccount *c_account, \
+        const_char *c_buddy_username, const_char *c_buddy_group, \
+        const_char *c_buddy_alias):
     """
-    TODO
+    Requests from the user information needed to add a buddy to the buddy
+    list.
     """
-    debug.c_purple_debug_info("blist", "%s", "request-add-buddy\n")
-    if blist_cbs.has_key("request-add-buddy"):
-        (<object> blist_cbs["request-add-buddy"])("request-add-buddy: TODO")
+    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 "request-add-buddy" in blist_cbs:
+        (<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.c_purple_debug_info("blist", "%s", "request-add-chat\n")
-    if blist_cbs.has_key("request-add-chat"):
+    debug.purple_debug_info("blist", "%s", "request-add-chat\n")
+    if "request-add-chat" in blist_cbs:
         (<object> blist_cbs["request-add-chat"])("request-add-chat: TODO")
 
 cdef void request_add_group():
     """
     TODO
     """
-    debug.c_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")
+    debug.purple_debug_info("blist", "%s", "request-add-group\n")
+    if "request-add-group" in blist_cbs:
+        (<object>blist_cbs["request-add-group"])("request-add-group: TODO")