pidgin: 7ce8c7bf: Finch: Use purple_blist_node_get_ui_data...
andrew.victor at mxit.com
andrew.victor at mxit.com
Mon Oct 31 17:31:06 EDT 2011
----------------------------------------------------------------------
Revision: 7ce8c7bf6d6b140b5de25d0515e2aac8752db404
Parent: 7602af90be7836b5e42ae409d4745833e2d6141c
Author: andrew.victor at mxit.com
Date: 10/31/11 16:44:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7ce8c7bf6d6b140b5de25d0515e2aac8752db404
Changelog:
Finch: Use purple_blist_node_get_ui_data() and purple_blist_node_set_ui_data().
Changes against parent 7602af90be7836b5e42ae409d4745833e2d6141c
patched finch/gntblist.c
-------------- next part --------------
============================================================
--- finch/gntblist.c 7b8217186c45988d367383f323edcaff89698033
+++ finch/gntblist.c 108396f3750bc1c3f1b01a1065021ea62f1ac0ef
@@ -169,7 +169,7 @@ static gboolean default_can_add_node(Pur
if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
PurpleBuddy *buddy = (PurpleBuddy*)node;
- FinchBlistNode *fnode = FINCH_GET_DATA(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (!purple_buddy_get_contact(buddy))
return FALSE; /* When a new buddy is added and show-offline is set */
if (PURPLE_BUDDY_IS_ONLINE(buddy))
@@ -329,11 +329,11 @@ create_finch_blist_node(PurpleBlistNode
static FinchBlistNode *
create_finch_blist_node(PurpleBlistNode *node, gpointer row)
{
- FinchBlistNode *fnode = FINCH_GET_DATA(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (!fnode) {
fnode = g_new0(FinchBlistNode, 1);
fnode->signed_timer = 0;
- FINCH_SET_DATA(node, fnode);
+ purple_blist_node_set_ui_data(node, fnode);
}
fnode->row = row;
return fnode;
@@ -342,13 +342,13 @@ reset_blist_node_ui_data(PurpleBlistNode
static void
reset_blist_node_ui_data(PurpleBlistNode *node)
{
- FinchBlistNode *fnode = FINCH_GET_DATA(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (fnode == NULL)
return;
if (fnode->signed_timer)
purple_timeout_remove(fnode->signed_timer);
g_free(fnode);
- FINCH_SET_DATA(node, NULL);
+ purple_blist_node_set_ui_data(node, NULL);
}
static int
@@ -381,7 +381,7 @@ get_blist_node_flag(PurpleBlistNode *nod
get_blist_node_flag(PurpleBlistNode *node)
{
GntTextFormatFlags flag = 0;
- FinchBlistNode *fnode = FINCH_GET_DATA(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (ggblist->tagged && g_list_find(ggblist->tagged, node))
flag |= GNT_TEXT_FLAG_BOLD;
@@ -390,7 +390,7 @@ get_blist_node_flag(PurpleBlistNode *nod
flag |= GNT_TEXT_FLAG_BLINK;
else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
node = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(node)));
- fnode = FINCH_GET_DATA(node);
+ fnode = purple_blist_node_get_ui_data(node);
if (fnode && fnode->signed_timer)
flag |= GNT_TEXT_FLAG_BLINK;
} else if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
@@ -406,7 +406,7 @@ get_blist_node_flag(PurpleBlistNode *nod
node = purple_blist_node_get_sibling_next(node)) {
PurpleBlistNode *pnode;
pnode = purple_contact_get_priority_buddy((PurpleContact*)node);
- fnode = FINCH_GET_DATA(node);
+ fnode = purple_blist_node_get_ui_data(node);
if (fnode && fnode->signed_timer) {
flag |= GNT_TEXT_FLAG_BLINK;
break;
@@ -433,7 +433,7 @@ is_contact_online(PurpleContact *contact
PurpleBlistNode *node;
for (node = purple_blist_node_get_first_child(((PurpleBlistNode*)contact)); node;
node = purple_blist_node_get_sibling_next(node)) {
- FinchBlistNode *fnode = FINCH_GET_DATA(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (PURPLE_BUDDY_IS_ONLINE((PurpleBuddy*)node) ||
(fnode && fnode->signed_timer))
return TRUE;
@@ -465,7 +465,7 @@ add_node(PurpleBlistNode *node, FinchBli
static void
add_node(PurpleBlistNode *node, FinchBlist *ggblist)
{
- if (FINCH_GET_DATA(node))
+ if (purple_blist_node_get_ui_data(node))
return;
if (!ggblist->manager->can_add_node(node))
@@ -502,7 +502,7 @@ node_remove(PurpleBuddyList *list, Purpl
FinchBlist *ggblist = FINCH_GET_DATA(list);
PurpleBlistNode *parent;
- if (ggblist == NULL || FINCH_GET_DATA(node) == NULL)
+ if (ggblist == NULL || purple_blist_node_get_ui_data(node) == NULL)
return;
if (PURPLE_BLIST_NODE_IS_GROUP(node) && ggblist->new_group) {
@@ -543,7 +543,7 @@ node_update(PurpleBuddyList *list, Purpl
if (ggblist->window == NULL)
return;
- if (FINCH_GET_DATA(node)!= NULL) {
+ if (purple_blist_node_get_ui_data(node)!= NULL) {
gnt_tree_change_text(GNT_TREE(ggblist->tree), node,
0, get_display_name(node));
gnt_tree_sort_row(GNT_TREE(ggblist->tree), node);
@@ -560,7 +560,7 @@ node_update(PurpleBuddyList *list, Purpl
} else if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
add_node(node, FINCH_GET_DATA(list));
} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
- if (FINCH_GET_DATA(node)== NULL) {
+ if (purple_blist_node_get_ui_data(node)== NULL) {
/* The core seems to expect the UI to add the buddies. */
for (node = purple_blist_node_get_first_child(node); node; node = purple_blist_node_get_sibling_next(node))
add_node(node, FINCH_GET_DATA(list));
@@ -839,7 +839,7 @@ add_group_cb(gpointer null, const char *
/* Select the group */
if (ggblist->tree) {
- FinchBlistNode *fnode = FINCH_GET_DATA((PurpleBlistNode*)grp);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data((PurpleBlistNode*)grp);
if (!fnode)
add_node((PurpleBlistNode*)grp, ggblist);
gnt_tree_set_selected(GNT_TREE(ggblist->tree), grp);
@@ -887,7 +887,7 @@ add_group(PurpleGroup *group, FinchBlist
{
gpointer parent;
PurpleBlistNode *node = (PurpleBlistNode *)group;
- if (FINCH_GET_DATA(node))
+ if (purple_blist_node_get_ui_data(node))
return;
parent = ggblist->manager->find_parent((PurpleBlistNode*)group);
create_finch_blist_node(node, gnt_tree_add_row_after(GNT_TREE(ggblist->tree), group,
@@ -960,7 +960,7 @@ add_chat(PurpleChat *chat, FinchBlist *g
{
gpointer parent;
PurpleBlistNode *node = (PurpleBlistNode *)chat;
- if (FINCH_GET_DATA(node))
+ if (purple_blist_node_get_ui_data(node))
return;
if (!purple_account_is_connected(purple_chat_get_account(chat)))
return;
@@ -979,7 +979,7 @@ add_contact(PurpleContact *contact, Finc
PurpleBlistNode *node = (PurpleBlistNode*)contact;
const char *name;
- if (FINCH_GET_DATA(node))
+ if (purple_blist_node_get_ui_data(node))
return;
name = get_display_name(node);
@@ -1002,7 +1002,7 @@ add_buddy(PurpleBuddy *buddy, FinchBlist
PurpleBlistNode *node = (PurpleBlistNode *)buddy;
PurpleContact *contact;
- if (FINCH_GET_DATA(node))
+ if (purple_blist_node_get_ui_data(node))
return;
contact = purple_buddy_get_contact(buddy);
@@ -2545,7 +2545,7 @@ buddy_recent_signed_on_off(gpointer data
buddy_recent_signed_on_off(gpointer data)
{
PurpleBlistNode *node = data;
- FinchBlistNode *fnode = FINCH_GET_DATA(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
purple_timeout_remove(fnode->signed_timer);
fnode->signed_timer = 0;
@@ -2565,7 +2565,7 @@ buddy_signed_on_off_cb(gpointer data)
buddy_signed_on_off_cb(gpointer data)
{
PurpleBlistNode *node = data;
- FinchBlistNode *fnode = FINCH_GET_DATA(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (!ggblist || !fnode)
return FALSE;
More information about the Commits
mailing list