pidgin.next.minor: df03f4f6: Update some casts (that the script didn'...
rlaager at pidgin.im
rlaager at pidgin.im
Fri Nov 14 01:10:39 EST 2008
-----------------------------------------------------------------
Revision: df03f4f64f6b39a434522f82a1ab7b5879436cab
Ancestor: b0b41393064106eacd6ab68870f2b742de2f7e3b
Author: rlaager at pidgin.im
Date: 2008-11-14T05:32:35
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/df03f4f64f6b39a434522f82a1ab7b5879436cab
Modified files:
finch/gntblist.c finch/gntconv.c finch/plugins/grouping.c
libpurple/blist.c libpurple/plugins/autoaccept.c
libpurple/plugins/tcl/tcl_cmds.c pidgin/gtkblist.c
pidgin/gtkconv.c
ChangeLog:
Update some casts (that the script didn't fix correctly) to GObject macros.
-------------- next part --------------
============================================================
--- finch/gntblist.c 474c9e16b411dc8252e8ded5382fdf2ba9ecab2e
+++ finch/gntblist.c 5b1b79b447d86d274b8b67f993966fed0dac0b2d
@@ -357,7 +357,7 @@ get_display_color(PurpleBlistNode *node
int color = 0;
if (PURPLE_BLIST_NODE_IS_CONTACT(node))
- node = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)node);
+ node = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(node)));
if (!PURPLE_BLIST_NODE_IS_BUDDY(node))
return 0;
@@ -388,7 +388,7 @@ get_blist_node_flag(PurpleBlistNode *nod
if (fnode && fnode->signed_timer)
flag |= GNT_TEXT_FLAG_BLINK;
else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
- node = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact *)node);
+ node = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(node)));
fnode = FINCH_GET_DATA(node);
if (fnode && fnode->signed_timer)
flag |= GNT_TEXT_FLAG_BLINK;
@@ -886,7 +886,7 @@ get_display_name(PurpleBlistNode *node)
const char *name = NULL;
if (PURPLE_BLIST_NODE_IS_CONTACT(node))
- node = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)node); /* XXX: this can return NULL?! */
+ node = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(node))); /* XXX: this can return NULL?! */
if (node == NULL)
return NULL;
@@ -1027,7 +1027,7 @@ selection_activate(GntWidget *widget, Fi
return;
if (PURPLE_BLIST_NODE_IS_CONTACT(node))
- node = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)node);
+ node = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(node)));
if (PURPLE_BLIST_NODE_IS_BUDDY(node))
{
@@ -1571,8 +1571,8 @@ finch_blist_toggle_tag_buddy(PurpleBlist
ggblist->tagged = g_list_prepend(ggblist->tagged, node);
}
if (PURPLE_BLIST_NODE_IS_CONTACT(node))
- node = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)node);
- if (PURPLE_BLIST_NODE_IS_BUDDY(node))
+ update_buddy_display(purple_contact_get_priority_buddy(PURPLE_CONTACT(node)), ggblist);
+ else if (PURPLE_BLIST_NODE_IS_BUDDY(node))
update_buddy_display((PurpleBuddy*)node, ggblist);
else
update_node_display(node, ggblist);
@@ -1612,7 +1612,7 @@ finch_blist_place_tagged(PurpleBlistNode
purple_blist_add_group((PurpleGroup*)node, (PurpleBlistNode*)tg);
} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
update_buddy_display(purple_contact_get_priority_buddy((PurpleContact*)node), ggblist);
- if ((PurpleBlistNode*)tg == target) {
+ if (PURPLE_BLIST_NODE(tg) == target) {
/* The target is a group, just add the contact to the group. */
purple_blist_add_contact((PurpleContact*)node, tg, NULL);
} else if (tc) {
@@ -1624,7 +1624,7 @@ finch_blist_place_tagged(PurpleBlistNode
}
} else if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
update_buddy_display((PurpleBuddy*)node, ggblist);
- if ((PurpleBlistNode*)tg == target) {
+ if (PURPLE_BLIST_NODE(tg) == target) {
/* The target is a group. Add this buddy in a new contact under this group. */
purple_blist_add_buddy((PurpleBuddy*)node, NULL, tg, NULL);
} else if (PURPLE_BLIST_NODE_IS_CONTACT(target)) {
@@ -1639,7 +1639,7 @@ finch_blist_place_tagged(PurpleBlistNode
}
} else if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
update_node_display(node, ggblist);
- if ((PurpleBlistNode*)tg == target)
+ if (PURPLE_BLIST_NODE(tg) == target)
purple_blist_add_chat((PurpleChat*)node, tg, NULL);
else
purple_blist_add_chat((PurpleChat*)node, NULL, target);
@@ -1685,7 +1685,7 @@ draw_context_menu(FinchBlist *ggblist)
create_group_menu(GNT_MENU(context), NULL);
title = g_strdup(_("Buddy List"));
} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
- ggblist->cnode = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)node);
+ ggblist->cnode = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(node)));
create_buddy_menu(GNT_MENU(context), (PurpleBuddy*)ggblist->cnode);
title = g_strdup(purple_contact_get_alias((PurpleContact*)node));
} else if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
@@ -2412,8 +2412,8 @@ blist_node_compare_status(PurpleBlistNod
switch (purple_blist_node_get_type(n1)) {
case PURPLE_BLIST_CONTACT_NODE:
- n1 = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)n1);
- n2 = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)n2);
+ n1 = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(n1)));
+ n2 = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(n2)));
/* now compare the presence of the priority buddies */
case PURPLE_BLIST_BUDDY_NODE:
ret = purple_presence_compare(purple_buddy_get_presence((PurpleBuddy*)n1),
============================================================
--- finch/gntconv.c 432ae251b6e9b10f9068b072283351bc0542ae8a
+++ finch/gntconv.c f1487966d3d8a5efc3798a9bedf9d69ae6bca580
@@ -530,7 +530,7 @@ generate_send_to_menu(FinchConv *ggc)
gnt_menuitem_set_submenu(item, GNT_MENU(sub));
for (; buds; buds = g_slist_delete_link(buds, buds)) {
- PurpleBlistNode *node = (PurpleBlistNode *)purple_buddy_get_contact((PurpleBuddy *)buds->data);
+ PurpleBlistNode *node = PURPLE_BLIST_NODE(purple_buddy_get_contact(PURPLE_BUDDY(buds->data)));
for (node = purple_blist_node_get_first_child(node); node != NULL;
node = purple_blist_node_get_sibling_next(node)) {
PurpleBuddy *buddy = (PurpleBuddy *)node;
============================================================
--- finch/plugins/grouping.c f5828a65dcdb3bfb713f9d2694d9c0ca3dfed6e9
+++ finch/plugins/grouping.c f4588ab343b65617e9cb445ebaa05cda1a36b0fa
@@ -87,7 +87,7 @@ static gpointer on_offline_find_parent(P
switch (purple_blist_node_get_type(node)) {
case PURPLE_BLIST_CONTACT_NODE:
- node = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)node);
+ node = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(node)));
ret = PURPLE_BUDDY_IS_ONLINE((PurpleBuddy*)node) ? &online : &offline;
break;
case PURPLE_BLIST_BUDDY_NODE:
============================================================
--- libpurple/blist.c f707cb7a5c085ae1a30ff055bc60b25f19b2bf27
+++ libpurple/blist.c 71ce7d8bc32b5e66a51afd9713ad04f4513da6c5
@@ -813,6 +813,7 @@ purple_blist_update_buddy_status(PurpleB
PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
PurplePresence *presence;
PurpleStatus *status;
+ PurpleBlistNode *cnode;
g_return_if_fail(buddy != NULL);
@@ -827,16 +828,18 @@ purple_blist_update_buddy_status(PurpleB
purple_signal_emit(purple_blist_get_handle(), "buddy-signed-on", buddy);
- ((PurpleContact*)((PurpleBlistNode*)buddy)->parent)->online++;
- if (((PurpleContact*)((PurpleBlistNode*)buddy)->parent)->online == 1)
- ((PurpleGroup *)((PurpleBlistNode *)buddy)->parent->parent)->online++;
+ cnode = buddy->node.parent;
+ if (++(PURPLE_CONTACT(cnode)->online) == 1)
+ PURPLE_GROUP(cnode->parent)->online++;
} else if (!purple_status_is_online(status) &&
purple_status_is_online(old_status)) {
+
purple_blist_node_set_int(&buddy->node, "last_seen", time(NULL));
purple_signal_emit(purple_blist_get_handle(), "buddy-signed-off", buddy);
- ((PurpleContact*)((PurpleBlistNode*)buddy)->parent)->online--;
- if (((PurpleContact*)((PurpleBlistNode*)buddy)->parent)->online == 0)
- ((PurpleGroup *)((PurpleBlistNode *)buddy)->parent->parent)->online--;
+
+ cnode = buddy->node.parent;
+ if (--(PURPLE_CONTACT(cnode)->online) == 0)
+ PURPLE_GROUP(cnode->parent)->online--;
} else {
purple_signal_emit(purple_blist_get_handle(),
"buddy-status-changed", buddy, old_status,
@@ -1389,7 +1392,7 @@ void purple_blist_add_buddy(PurpleBuddy
g = (PurpleGroup*)node->parent->parent;
} else if (contact) {
c = contact;
- g = (PurpleGroup *)((PurpleBlistNode *)c)->parent;
+ g = PURPLE_GROUP(PURPLE_BLIST_NODE(c)->parent);
} else {
g = group;
if (g == NULL)
@@ -1471,16 +1474,14 @@ void purple_blist_add_buddy(PurpleBuddy
}
if (PURPLE_BUDDY_IS_ONLINE(buddy)) {
- ((PurpleContact*)bnode->parent)->online++;
- if (((PurpleContact*)bnode->parent)->online == 1)
- ((PurpleGroup*)bnode->parent->parent)->online++;
+ if (++(PURPLE_CONTACT(bnode->parent)->online) == 1)
+ PURPLE_GROUP(bnode->parent->parent)->online++;
}
if (purple_account_is_connected(buddy->account)) {
- ((PurpleContact*)bnode->parent)->currentsize++;
- if (((PurpleContact*)bnode->parent)->currentsize == 1)
- ((PurpleGroup*)bnode->parent->parent)->currentsize++;
+ if (++(PURPLE_CONTACT(bnode->parent)->currentsize) == 1)
+ PURPLE_GROUP(bnode->parent->parent)->currentsize++;
}
- ((PurpleContact*)bnode->parent)->totalsize++;
+ PURPLE_CONTACT(bnode->parent)->totalsize++;
hb = g_new(struct _purple_hbuddy, 1);
hb->name = g_strdup(purple_normalize(buddy->account, buddy->name));
@@ -1596,7 +1597,7 @@ void purple_blist_add_contact(PurpleCont
g_return_if_fail(contact != NULL);
g_return_if_fail(PURPLE_BLIST_NODE_IS_CONTACT((PurpleBlistNode*)contact));
- if ((PurpleBlistNode*)contact == node)
+ if (PURPLE_BLIST_NODE(contact) == node)
return;
if (node && (PURPLE_BLIST_NODE_IS_CONTACT(node) ||
@@ -2341,7 +2342,7 @@ PurpleContact *purple_buddy_get_contact(
{
g_return_val_if_fail(buddy != NULL, NULL);
- return (PurpleContact*)((PurpleBlistNode*)buddy)->parent;
+ return PURPLE_CONTACT(PURPLE_BLIST_NODE(buddy)->parent);
}
PurplePresence *purple_buddy_get_presence(const PurpleBuddy *buddy)
============================================================
--- libpurple/plugins/autoaccept.c 56985f7a523a2c93c8e40b3ecf7648d47808f2ce
+++ libpurple/plugins/autoaccept.c afefac1805d8ac8aacfdb2db88e88ee3fd6be197
@@ -95,7 +95,7 @@ file_recv_request_cb(PurpleXfer *xfer, g
char *dirname;
account = xfer->account;
- node = (PurpleBlistNode *)purple_find_buddy(account, xfer->who);
+ node = PURPLE_BLIST_NODE(purple_find_buddy(account, xfer->who));
if (!node)
{
============================================================
--- libpurple/plugins/tcl/tcl_cmds.c 64de15bcee22460576334cb2cd888167b4444fbc
+++ libpurple/plugins/tcl/tcl_cmds.c e901c4b22e586a403c86d99c7c1dce23e5884a1c
@@ -401,9 +401,9 @@ static PurpleBlistNode *tcl_list_to_budd
return NULL;
if (!strcmp(type, "buddy")) {
- node = (PurpleBlistNode *)purple_find_buddy(account, name);
+ node = PURPLE_BLIST_NODE(purple_find_buddy(account, name));
} else if (!strcmp(type, "group")) {
- node = (PurpleBlistNode *)purple_blist_find_chat(account, name);
+ node = PURPLE_BLIST_NODE(purple_blist_find_chat(account, name));
}
return node;
============================================================
--- pidgin/gtkblist.c 7507ec029d7ca0a44b0321f228caddd029aa9ebd
+++ pidgin/gtkblist.c a2d92c0628c2d1c9bc7fe79d27c751aec9e6d38a
@@ -2532,7 +2532,7 @@ static void pidgin_blist_drag_data_rcv_c
node = g_value_get_pointer(&val);
if (PURPLE_BLIST_NODE_IS_BUDDY(node) || PURPLE_BLIST_NODE_IS_CONTACT(node)) {
- PurpleBuddy *b = PURPLE_BLIST_NODE_IS_BUDDY(node) ? (PurpleBuddy*)node : purple_contact_get_priority_buddy((PurpleContact*)node);
+ PurpleBuddy *b = PURPLE_BLIST_NODE_IS_BUDDY(node) ? PURPLE_BUDDY(node) : purple_contact_get_priority_buddy(PURPLE_CONTACT(node));
pidgin_dnd_file_manage(sd, b->account, b->name);
gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
} else {
@@ -3843,9 +3843,9 @@ pidgin_blist_get_name_markup(PurpleBuddy
}
/* XXX Good luck cleaning up this crap */
- contact = (PurpleContact*)((PurpleBlistNode*)b)->parent;
+ contact = PURPLE_CONTACT(PURPLE_BLIST_NODE(b)->parent);
if(contact)
- gtkcontactnode = ((PurpleBlistNode*)contact)->ui_data;
+ gtkcontactnode = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(contact));
/* Name */
if (gtkcontactnode && !gtkcontactnode->contact_expanded && contact->alias)
============================================================
--- pidgin/gtkconv.c 87efe1815b4d8e1c331a95ed086c5c2604ced7ab
+++ pidgin/gtkconv.c 2444d96cb59f335b60bf214a6baad6a837716cf3
@@ -201,11 +201,11 @@ get_conversation_blist_node(PurpleConver
switch (purple_conversation_get_type(conv)) {
case PURPLE_CONV_TYPE_IM:
- node = (PurpleBlistNode*)purple_find_buddy(conv->account, conv->name);
+ node = PURPLE_BLIST_NODE(purple_find_buddy(conv->account, conv->name));
node = node ? node->parent : NULL;
break;
case PURPLE_CONV_TYPE_CHAT:
- node = (PurpleBlistNode*)purple_blist_find_chat(conv->account, conv->name);
+ node = PURPLE_BLIST_NODE(purple_blist_find_chat(conv->account, conv->name));
break;
default:
break;
@@ -3858,7 +3858,7 @@ generate_send_to_items(PidginWindow *win
{
PurpleBlistNode *node;
- node = (PurpleBlistNode *) purple_buddy_get_contact((PurpleBuddy *)l->data);
+ node = PURPLE_BLIST_NODE(purple_buddy_get_contact(PURPLE_BUDDY(l->data)));
for (node = node->child; node != NULL; node = node->next)
{
@@ -5041,9 +5041,9 @@ pidgin_conv_find_gtkconv(PurpleConversat
static PidginConversation *
pidgin_conv_find_gtkconv(PurpleConversation * conv)
{
- PurpleBuddy *bud = purple_find_buddy(conv->account, conv->name), *b;
+ PurpleBuddy *bud = purple_find_buddy(conv->account, conv->name);
PurpleContact *c;
- PurpleBlistNode *cn;
+ PurpleBlistNode *cn, *bn;
if (!bud)
return NULL;
@@ -5051,8 +5051,9 @@ pidgin_conv_find_gtkconv(PurpleConversat
if (!(c = purple_buddy_get_contact(bud)))
return NULL;
- cn = (PurpleBlistNode *)c;
- for (b = (PurpleBuddy *)cn->child; b; b = (PurpleBuddy *) ((PurpleBlistNode *)b)->next) {
+ cn = PURPLE_BLIST_NODE(c);
+ for (bn = purple_blist_node_get_first_child(cn); bn; bn = purple_blist_node_get_sibling_next(bn)) {
+ PurpleBuddy *b = PURPLE_BUDDY(bn);
PurpleConversation *conv;
if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, b->account))) {
if (conv->ui_data)
More information about the Commits
mailing list