X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=blist_cbs.pxd;h=52847dcca9f8b310e2c62e4c31703917069aa8de;hp=c1830d6c73a3939291611dd976a7757b3d9367be;hb=1ebedbc8928e2e85faccc07f84da6b422040fb3e;hpb=55de8749720d1245639c903d2fef844d4e61d19e diff --git a/blist_cbs.pxd b/blist_cbs.pxd index c1830d6..52847dc 100644 --- a/blist_cbs.pxd +++ b/blist_cbs.pxd @@ -26,48 +26,55 @@ blist_cbs = {} cdef void __group_node_cb(blist.PurpleBlistNode *node, object callback): cdef blist.PurpleGroup *group = node + cdef char *c_name = NULL - if group.name: - name = group.name + c_name = blist.c_purple_group_get_name(group) + if c_name == NULL: + name = None else: - name = "" + 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 = node + cdef char *c_alias = NULL - if contact.alias: - alias = contact.alias + c_alias = blist.c_purple_contact_get_alias(contact) + if c_alias == NULL: + alias = None else: - alias = "" - - name = "" + alias = c_alias try: - callback(node.type, name, alias, contact.totalsize, contact.currentsize, \ + 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 = 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 = blist.c_purple_buddy_get_name(buddy) + if c_name == NULL: + name = None else: - alias = "" + name = c_name - if buddy.name: - name = buddy.name + c_alias = blist.c_purple_buddy_get_alias_only(buddy) + if c_alias == NULL: + alias = None else: - name = "" + alias = c_alias try: callback(node.type, name, alias) @@ -76,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 = node + cdef char *c_name = NULL - if chat.alias: - alias = chat.alias + c_name = blist.c_purple_chat_get_name(chat) + if c_name == NULL: + name = None else: - alias = "" + name = c_name try: - callback(node.type, alias) + callback(node.type, name) except KeyError: pass @@ -102,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"]) @@ -114,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: - (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: - (blist_cbs["show"])("show") + (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"]) @@ -140,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: - (blist_cbs["update"])(node.type) except KeyError: pass @@ -159,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: - (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: - (blist_cbs["destroy"])("destroy") + (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: - (blist_cbs["set_visible"])("set_visible") + (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: - (blist_cbs["request_add_buddy"])("request_add_buddy") + (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: - (blist_cbs["request_add_chat"])("request_add_chat") + (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: - (blist_cbs["request_add_chat"])("request_add_group") + (blist_cbs["request-add-chat"])("request-add-group: TODO") except KeyError: pass