FIXES:
- Added functions from libpurple which return strutcture attributes, instead of getting them directly.
Signed-off-by: Bruno Abinader <bruno.abinader@indt.org.br>
git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1354
596f6dd7-e928-0410-a184-
9e12fd12cf7e
cdef void __group_node_cb(blist.PurpleBlistNode *node, object callback):
cdef blist.PurpleGroup *group = <blist.PurpleGroup *>node
cdef void __group_node_cb(blist.PurpleBlistNode *node, object callback):
cdef blist.PurpleGroup *group = <blist.PurpleGroup *>node
- if group.name:
- name = group.name
- else:
+ name = <char *> blist.c_purple_group_get_name(group)
+ if name == NULL:
+ 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)
+
- 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
except KeyError:
pass
cdef void __contact_node_cb(blist.PurpleBlistNode *node, object callback):
cdef blist.PurpleContact *contact = <blist.PurpleContact *>node
+ cdef char *alias = NULL
- if contact.alias:
- alias = contact.alias
- else:
+ alias = <char *> blist.c_purple_contact_get_alias(contact)
+ if alias == NULL:
- 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 = <blist.PurpleBuddy *>node
contact.online)
except KeyError:
pass
cdef void __buddy_node_cb(blist.PurpleBlistNode *node, object callback):
cdef blist.PurpleBuddy *buddy = <blist.PurpleBuddy *>node
+ cdef char *name = NULL
+ cdef char *alias = NULL
- if buddy.server_alias:
- alias = buddy.server_alias
- elif buddy.alias:
- alias = buddy.alias
- else:
- alias = ""
-
- if buddy.name:
- name = buddy.name
- else:
+ name = <char *> blist.c_purple_buddy_get_name(buddy)
+ if name == NULL:
+ alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+ if alias == NULL:
+ alias = ""
try:
callback(node.type, name, alias)
try:
callback(node.type, name, alias)
cdef void __chat_node_cb(blist.PurpleBlistNode *node, object callback):
cdef blist.PurpleChat *chat = <blist.PurpleChat *>node
cdef void __chat_node_cb(blist.PurpleBlistNode *node, object callback):
cdef blist.PurpleChat *chat = <blist.PurpleChat *>node
- if chat.alias:
- alias = chat.alias
- else:
- alias = ""
+ name = <char *> blist.c_purple_chat_get_name(chat)
+ if name == NULL:
+ name = ""
- callback(node.type, alias)
+ callback(node.type, name)
cdef void new_node (blist.PurpleBlistNode *node):
debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "new_node\n")
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"])
try:
if node.type == blist.PURPLE_BLIST_GROUP_NODE:
__group_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"])
__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)
cdef void update (blist.PurpleBuddyList *list, blist.PurpleBlistNode *node):
debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "update\n")
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"])
try:
if node.type == blist.PURPLE_BLIST_GROUP_NODE:
__group_node_cb(node, blist_cbs["update"])
__chat_node_cb(node, blist_cbs["update"])
elif node.type == blist.PURPLE_BLIST_OTHER_NODE:
__other_node_cb(node, blist_cbs["update"])
__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)
__chat_node_cb(node, blist_cbs["remove"])
elif node.type == blist.PURPLE_BLIST_OTHER_NODE:
__other_node_cb(node, blist_cbs["remove"])
__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)
-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")
const_char *username, const_char *group,
const_char *alias):
debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "request_add_buddy\n")
-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")
blist.PurpleGroup *group, const_char *alias,
const_char *name):
debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "blist", "request_add_chat\n")
void *c_purple_blist_get_handle "purple_blist_get_handle" ()
void c_purple_blist_load "purple_blist_load" ()
PurpleBuddyList* c_purple_blist_new "purple_blist_new" ()
void *c_purple_blist_get_handle "purple_blist_get_handle" ()
void c_purple_blist_load "purple_blist_load" ()
PurpleBuddyList* c_purple_blist_new "purple_blist_new" ()
- PurpleBlistNodeType c_purple_blist_node_get_type "purple_blist_node_get_type" (PurpleBlistNode *node)
+ PurpleBlistNodeType c_purple_blist_node_get_type \
+ "purple_blist_node_get_type" (PurpleBlistNode *node)
+ int c_purple_blist_get_group_size "purple_blist_get_group_size" \
+ (PurpleGroup *group, glib.gboolean offline)
+ int c_purple_blist_get_group_online_count \
+ "purple_blist_get_group_online_count" (PurpleGroup *group)
void c_purple_blist_set_ui_ops "purple_blist_set_ui_ops" (PurpleBlistUiOps *ops)
const_char *c_purple_chat_get_name "purple_chat_get_name" (PurpleChat *chat)
void c_purple_blist_set_ui_ops "purple_blist_set_ui_ops" (PurpleBlistUiOps *ops)
const_char *c_purple_chat_get_name "purple_chat_get_name" (PurpleChat *chat)
+ const_char *c_purple_contact_get_alias "purple_contact_get_alias" (PurpleContact *contact)
const_char *c_purple_group_get_name "purple_group_get_name" (PurpleGroup *group)
PurpleBuddy *c_purple_buddy_new "purple_buddy_new" (account.PurpleAccount *account,
char *screenname, char *alias)
const_char *c_purple_group_get_name "purple_group_get_name" (PurpleGroup *group)
PurpleBuddy *c_purple_buddy_new "purple_buddy_new" (account.PurpleAccount *account,
char *screenname, char *alias)