pidgin: 7711a4d2: Use the PurpleBuddy accessor functions.
andrew.victor at mxit.com
andrew.victor at mxit.com
Sun Oct 30 17:50:47 EDT 2011
----------------------------------------------------------------------
Revision: 7711a4d267e1fe776387496c764fb63227d70aec
Parent: d909b20b8d4959e16b40234098df5c4306dadec6
Author: andrew.victor at mxit.com
Date: 10/30/11 17:46:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7711a4d267e1fe776387496c764fb63227d70aec
Changelog:
Use the PurpleBuddy accessor functions.
Changes against parent d909b20b8d4959e16b40234098df5c4306dadec6
patched pidgin/gtkblist.c
patched pidgin/gtkconv.c
patched pidgin/gtkdialogs.c
patched pidgin/gtkpounce.c
patched pidgin/gtkutils.c
-------------- next part --------------
============================================================
--- pidgin/gtkconv.c acd555e218fecc472d15c8ee3e7562c63b8ba982
+++ pidgin/gtkconv.c 2bf92aed080f88362b70cf3a4149fe3dcba795b9
@@ -857,7 +857,7 @@ invite_dnd_recv(GtkWidget *widget, GdkDr
else
return;
- if (strcmp(convprotocol, purple_account_get_protocol_id(buddy->account)))
+ if (strcmp(convprotocol, purple_account_get_protocol_id(purple_buddy_get_account(buddy))))
{
purple_notify_error(PIDGIN_CONVERSATION(info->conv), NULL,
_("That buddy is not on the same protocol as this "
@@ -4530,7 +4530,7 @@ update_chat_alias(PurpleBuddy *buddy, Pu
if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
return;
- normalized_name = g_strdup(purple_normalize(account, buddy->name));
+ normalized_name = g_strdup(purple_normalize(account, purple_buddy_get_name(buddy)));
do {
char *name;
@@ -4633,7 +4633,7 @@ buddy_cb_common(PurpleBuddy *buddy, Purp
if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
return;
- normalized_name = g_strdup(purple_normalize(purple_conversation_get_account(conv), buddy->name));
+ normalized_name = g_strdup(purple_normalize(purple_conversation_get_account(conv), purple_buddy_get_name(buddy)));
do {
char *name;
@@ -5565,7 +5565,7 @@ pidgin_conv_find_gtkconv(PurpleConversat
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 = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(b), purple_buddy_get_account(b)))) {
if (PIDGIN_CONVERSATION(conv))
return PIDGIN_CONVERSATION(conv);
}
@@ -7963,7 +7963,7 @@ get_gtkconv_with_contact(PurpleContact *
{
PurpleBuddy *buddy = (PurpleBuddy*)node;
PurpleConversation *conv;
- conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddy->name, buddy->account);
+ conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(buddy), purple_buddy_get_account(buddy));
if (conv)
return PIDGIN_CONVERSATION(conv);
}
@@ -8066,7 +8066,7 @@ update_buddy_idle_changed(PurpleBuddy *b
{
PurpleConversation *conv;
- conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddy->name, buddy->account);
+ conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(buddy), purple_buddy_get_account(buddy));
if (conv)
pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON);
}
@@ -8076,7 +8076,7 @@ update_buddy_icon(PurpleBuddy *buddy)
{
PurpleConversation *conv;
- conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddy->name, buddy->account);
+ conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(buddy), purple_buddy_get_account(buddy));
if (conv)
pidgin_conv_update_fields(conv, PIDGIN_CONV_BUDDY_ICON);
}
============================================================
--- pidgin/gtkutils.c 3a7384188da7ab2b7902d3ba472ca2418a1993ec
+++ pidgin/gtkutils.c 7350deb513f52bc6d17d6c4b66aea73eb282d1a8
@@ -2134,8 +2134,8 @@ add_completion_list(PidginCompletionData
add_buddyname_autocomplete_entry(data->store,
((PurpleContact *)cnode)->alias,
purple_buddy_get_contact_alias(entry.entry.buddy),
- entry.entry.buddy->account,
- entry.entry.buddy->name
+ purple_buddy_get_account(entry.entry.buddy),
+ purple_buddy_get_name(entry.entry.buddy)
);
}
}
@@ -2227,7 +2227,7 @@ pidgin_screenname_autocomplete_default_f
gboolean all = GPOINTER_TO_INT(all_accounts);
if (completion_entry->is_buddy) {
- return all || purple_account_is_connected(completion_entry->entry.buddy->account);
+ return all || purple_account_is_connected(purple_buddy_get_account(completion_entry->entry.buddy));
} else {
return all || (completion_entry->entry.logged_buddy->account != NULL && purple_account_is_connected(completion_entry->entry.logged_buddy->account));
}
============================================================
--- pidgin/gtkpounce.c b5c26953afbaa151484b507c80b9c6163cffe70a
+++ pidgin/gtkpounce.c 11ce2ecefe082d58c38b92fd77a1ba53c933f4d4
@@ -427,9 +427,9 @@ pounce_dnd_recv(GtkWidget *widget, GdkDr
dialog = (PidginPounceDialog *)data;
- gtk_entry_set_text(GTK_ENTRY(dialog->buddy_entry), buddy->name);
- dialog->account = buddy->account;
- pidgin_account_option_menu_set_selected(dialog->account_menu, buddy->account);
+ gtk_entry_set_text(GTK_ENTRY(dialog->buddy_entry), purple_buddy_get_name(buddy));
+ dialog->account = purple_buddy_get_account(buddy);
+ pidgin_account_option_menu_set_selected(dialog->account_menu, purple_buddy_get_account(buddy));
gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
}
============================================================
--- pidgin/gtkblist.c 06b3b72e5c9008f823a565278148e6a1bfd3c81f
+++ pidgin/gtkblist.c 04bedc56142989b75b1e0cd08e92587a1b503349
@@ -1521,7 +1521,7 @@ pidgin_blist_make_buddy_menu(GtkWidget *
if (prpl_info && prpl_info->send_file) {
if (!prpl_info->can_receive_file ||
- prpl_info->can_receive_file(purple_account_get_connection(buddy->account), buddy->name))
+ prpl_info->can_receive_file(purple_account_get_connection(purple_buddy_get_account(buddy)), purple_buddy_get_name(buddy)))
{
pidgin_new_item_from_stock(menu, _("_Send File..."),
PIDGIN_STOCK_TOOLBAR_SEND_FILE,
@@ -1549,7 +1549,7 @@ pidgin_blist_make_buddy_menu(GtkWidget *
NULL, G_CALLBACK(gtk_blist_menu_showoffline_cb), node, 0, 0, NULL);
}
- pidgin_append_blist_node_proto_menu(menu, purple_account_get_connection(buddy->account), node);
+ pidgin_append_blist_node_proto_menu(menu, purple_account_get_connection(purple_buddy_get_account(buddy)), node);
pidgin_append_blist_node_extended_menu(menu, node);
if (!contact_expanded && contact != NULL)
@@ -1602,7 +1602,7 @@ gtk_blist_key_press_cb(GtkWidget *tv, Gd
return FALSE;
}
if(buddy)
- pidgin_retrieve_user_info(purple_account_get_connection(buddy->account), buddy->name);
+ pidgin_retrieve_user_info(purple_account_get_connection(purple_buddy_get_account(buddy)), purple_buddy_get_name(buddy));
} else {
switch (event->keyval) {
case GDK_F2:
@@ -1840,13 +1840,13 @@ create_buddy_menu(PurpleBlistNode *node,
if(buddy == b)
continue;
- if(!purple_account_get_connection(buddy->account))
+ if(!purple_account_get_connection(purple_buddy_get_account(buddy)))
continue;
if(!show_offline && !PURPLE_BUDDY_IS_ONLINE(buddy))
continue;
- menuitem = gtk_image_menu_item_new_with_label(buddy->name);
- buf = pidgin_create_prpl_icon(buddy->account,PIDGIN_PRPL_ICON_SMALL);
+ menuitem = gtk_image_menu_item_new_with_label(purple_buddy_get_name(buddy));
+ buf = pidgin_create_prpl_icon(purple_buddy_get_account(buddy), PIDGIN_PRPL_ICON_SMALL);
image = gtk_image_new_from_pixbuf(buf);
g_object_unref(G_OBJECT(buf));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem),
@@ -1964,12 +1964,12 @@ gtk_blist_button_press_cb(GtkWidget *tv,
else
b = (PurpleBuddy *)node;
- prpl = purple_find_prpl(purple_account_get_protocol_id(b->account));
+ prpl = purple_find_prpl(purple_account_get_protocol_id(purple_buddy_get_account(b)));
if (prpl != NULL)
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
if (prpl && prpl_info->get_info)
- pidgin_retrieve_user_info(purple_account_get_connection(b->account), b->name);
+ pidgin_retrieve_user_info(purple_account_get_connection(purple_buddy_get_account(b)), purple_buddy_get_name(b));
handled = TRUE;
}
@@ -2294,7 +2294,7 @@ static void pidgin_blist_drag_data_get_c
buddy = (PurpleBuddy *)node;
}
- gc = purple_account_get_connection(buddy->account);
+ gc = purple_account_get_connection(purple_buddy_get_account(buddy));
if (gc == NULL)
{
@@ -2303,7 +2303,7 @@ static void pidgin_blist_drag_data_get_c
}
protocol =
- PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->list_icon(buddy->account,
+ PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->list_icon(purple_buddy_get_account(buddy),
buddy);
str = g_string_new(NULL);
@@ -2313,13 +2313,13 @@ static void pidgin_blist_drag_data_get_c
"X-IM-Protocol: %s\r\n"
"X-IM-Username: %s\r\n",
protocol,
- buddy->name);
+ purple_buddy_get_name(buddy));
- if (buddy->alias != NULL)
+ if (purple_buddy_get_local_buddy_alias(buddy) != NULL)
{
g_string_append_printf(str,
"X-IM-Alias: %s\r\n",
- buddy->alias);
+ purple_buddy_get_local_buddy_alias(buddy));
}
g_string_append(str, "\r\n");
@@ -2602,7 +2602,7 @@ static void pidgin_blist_drag_data_rcv_c
if (PURPLE_BLIST_NODE_IS_BUDDY(node) || PURPLE_BLIST_NODE_IS_CONTACT(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);
+ pidgin_dnd_file_manage(sd, purple_buddy_get_account(b), purple_buddy_get_name(b));
gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
} else {
gtk_drag_finish(dc, FALSE, FALSE, t);
@@ -2702,7 +2702,7 @@ static GdkPixbuf *pidgin_blist_get_buddy
if (data == NULL) {
if (buddy) {
/* Not sure I like this...*/
- if (!(icon = purple_buddy_icons_find(buddy->account, buddy->name)))
+ if (!(icon = purple_buddy_icons_find(purple_buddy_get_account(buddy), purple_buddy_get_name(buddy))))
return NULL;
data = purple_buddy_icon_get_data(icon, &len);
}
@@ -2872,7 +2872,7 @@ static struct tooltip_data * create_tip_
char *tmp = NULL, *node_name = NULL, *tooltip_text = NULL;
if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
- account = ((PurpleBuddy*)(node))->account;
+ account = purple_buddy_get_account((PurpleBuddy*)(node));
} else if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
account = ((PurpleChat*)(node))->account;
}
@@ -3205,8 +3205,8 @@ static gboolean buddy_is_displayable(Pur
gtknode = ((PurpleBlistNode*)buddy)->ui_data;
- return (purple_account_is_connected(buddy->account) &&
- (purple_presence_is_online(buddy->presence) ||
+ return (purple_account_is_connected(purple_buddy_get_account(buddy)) &&
+ (purple_presence_is_online(purple_buddy_get_presence(buddy)) ||
(gtknode && gtknode->recent_signonoff) ||
purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies") ||
purple_blist_node_get_bool((PurpleBlistNode*)buddy, "show_offline")));
@@ -3766,7 +3766,7 @@ static char *pidgin_get_tooltip_text(Pur
c = purple_buddy_get_contact(b);
}
- prpl = purple_find_prpl(purple_account_get_protocol_id(b->account));
+ prpl = purple_find_prpl(purple_account_get_protocol_id(purple_buddy_get_account(b)));
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
presence = purple_buddy_get_presence(b);
@@ -3783,12 +3783,12 @@ static char *pidgin_get_tooltip_text(Pur
/* Alias */
/* If there's not a contact alias, the node is being displayed with
* this alias, so there's no point in showing it in the tooltip. */
- if (full && c && b->alias != NULL && b->alias[0] != '\0' &&
+ if (full && c && purple_buddy_get_local_buddy_alias(b) != NULL && purple_buddy_get_local_buddy_alias(b)[0] != '\0' &&
(c->alias != NULL && c->alias[0] != '\0') &&
- strcmp(c->alias, b->alias) != 0)
+ strcmp(c->alias, purple_buddy_get_local_buddy_alias(b)) != 0)
{
purple_notify_user_info_add_pair_plaintext(user_info,
- _("Buddy Alias"), b->alias);
+ _("Buddy Alias"), purple_buddy_get_local_buddy_alias(b));
}
/* Nickname/Server Alias */
@@ -3796,10 +3796,10 @@ static char *pidgin_get_tooltip_text(Pur
* alias, but many people on MSN set long nicknames, which
* get ellipsized, so the only way to see the whole thing is
* to look at the tooltip. */
- if (full && b->server_alias != NULL && b->server_alias[0] != '\0')
+ if (full && purple_buddy_get_server_alias(b))
{
purple_notify_user_info_add_pair_plaintext(user_info,
- _("Nickname"), b->server_alias);
+ _("Nickname"), purple_buddy_get_server_alias(b));
}
/* Logged In */
@@ -3874,7 +3874,7 @@ static char *pidgin_get_tooltip_text(Pur
purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), _("Offline"));
}
- if (purple_account_is_connected(b->account) &&
+ if (purple_account_is_connected(purple_buddy_get_account(b)) &&
prpl_info && prpl_info->tooltip_text)
{
/* Additional text from the PRPL */
@@ -3882,11 +3882,11 @@ static char *pidgin_get_tooltip_text(Pur
}
/* These are Easter Eggs. Patches to remove them will be rejected. */
- if (!g_ascii_strcasecmp(b->name, "robflynn"))
+ if (!g_ascii_strcasecmp(purple_buddy_get_name(b), "robflynn"))
purple_notify_user_info_add_pair_plaintext(user_info, _("Description"), _("Spooky"));
- if (!g_ascii_strcasecmp(b->name, "seanegn"))
+ if (!g_ascii_strcasecmp(purple_buddy_get_name(b), "seanegn"))
purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), _("Awesome"));
- if (!g_ascii_strcasecmp(b->name, "chipx86"))
+ if (!g_ascii_strcasecmp(purple_buddy_get_name(b), "chipx86"))
purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), _("Rockin'"));
tmp = purple_notify_user_info_get_text_with_newline(user_info, "\n");
@@ -3989,7 +3989,7 @@ pidgin_blist_get_emblem(PurpleBlistNode
if (((struct _pidgin_blist_node*)(node->parent->ui_data))->contact_expanded) {
if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"))
return NULL;
- return pidgin_create_prpl_icon(((PurpleBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
+ return pidgin_create_prpl_icon(purple_buddy_get_account((PurpleBuddy*)node), PIDGIN_PRPL_ICON_SMALL);
}
} else {
return NULL;
@@ -3997,7 +3997,7 @@ pidgin_blist_get_emblem(PurpleBlistNode
g_return_val_if_fail(buddy != NULL, NULL);
- if (!purple_privacy_check(buddy->account, purple_buddy_get_name(buddy))) {
+ if (!purple_privacy_check(purple_buddy_get_account(buddy), purple_buddy_get_name(buddy))) {
path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "blocked.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
@@ -4033,7 +4033,7 @@ pidgin_blist_get_emblem(PurpleBlistNode
return _pidgin_blist_get_cached_emblem(path);
}
- prpl = purple_find_prpl(purple_account_get_protocol_id(buddy->account));
+ prpl = purple_find_prpl(purple_account_get_protocol_id(purple_buddy_get_account(buddy)));
if (!prpl)
return NULL;
@@ -4097,7 +4097,7 @@ pidgin_blist_get_status_icon(PurpleBlist
PurplePlugin *prpl;
if(buddy)
- account = buddy->account;
+ account = purple_buddy_get_account(buddy);
else
account = chat->account;
@@ -4232,12 +4232,12 @@ pidgin_blist_get_name_markup(PurpleBuddy
if (!aliased || biglist) {
/* Status Info */
- prpl = purple_find_prpl(purple_account_get_protocol_id(b->account));
+ prpl = purple_find_prpl(purple_account_get_protocol_id(purple_buddy_get_account(b)));
if (prpl != NULL)
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
- if (prpl_info && prpl_info->status_text && purple_account_get_connection(b->account)) {
+ if (prpl_info && prpl_info->status_text && purple_account_get_connection(purple_buddy_get_account(b))) {
char *tmp = prpl_info->status_text(b);
const char *end;
@@ -6295,7 +6295,7 @@ static gboolean pidgin_blist_group_has_s
if(PURPLE_BLIST_NODE_IS_CONTACT(cnode)) {
for(bnode = cnode->child; bnode; bnode = bnode->next) {
PurpleBuddy *buddy = (PurpleBuddy *)bnode;
- if (purple_account_is_connected(buddy->account) &&
+ if (purple_account_is_connected(purple_buddy_get_account(buddy)) &&
purple_blist_node_get_bool(bnode, "show_offline"))
return TRUE;
}
@@ -6527,7 +6527,7 @@ static void buddy_node(PurpleBuddy *budd
}
}
- prpl_icon = pidgin_create_prpl_icon(buddy->account, PIDGIN_PRPL_ICON_SMALL);
+ prpl_icon = pidgin_create_prpl_icon(purple_buddy_get_account(buddy), PIDGIN_PRPL_ICON_SMALL);
if (theme != NULL)
color = pidgin_blist_theme_get_contact_color(theme);
@@ -7828,7 +7828,7 @@ static void sort_method_log_activity(Pur
PurpleBuddy *buddy;
for (n = node->child; n; n = n->next) {
buddy = (PurpleBuddy*)n;
- activity_score += purple_log_get_activity_score(PURPLE_LOG_IM, buddy->name, buddy->account);
+ activity_score += purple_log_get_activity_score(PURPLE_LOG_IM, purple_buddy_get_name(buddy), purple_buddy_get_account(buddy));
}
buddy_name = purple_contact_get_alias((PurpleContact*)node);
} else if(PURPLE_BLIST_NODE_IS_CHAT(node)) {
@@ -7864,7 +7864,7 @@ static void sort_method_log_activity(Pur
if(PURPLE_BLIST_NODE_IS_CONTACT(n)) {
for (n2 = n->child; n2; n2 = n2->next) {
buddy = (PurpleBuddy*)n2;
- this_log_activity_score += purple_log_get_activity_score(PURPLE_LOG_IM, buddy->name, buddy->account);
+ this_log_activity_score += purple_log_get_activity_score(PURPLE_LOG_IM, purple_buddy_get_name(buddy), purple_buddy_get_account(buddy));
}
this_buddy_name = purple_contact_get_alias((PurpleContact*)n);
} else {
============================================================
--- pidgin/gtkdialogs.c 71888f0393d70be77133b6fc846da880e2df5017
+++ pidgin/gtkdialogs.c baf296c8c8bac5bdf52778337a465beead236e70
@@ -1127,10 +1127,10 @@ pidgin_dialogs_alias_buddy(PurpleBuddy *
g_return_if_fail(buddy != NULL);
- secondary = g_strdup_printf(_("Enter an alias for %s."), buddy->name);
+ secondary = g_strdup_printf(_("Enter an alias for %s."), purple_buddy_get_name(buddy));
purple_request_input(NULL, _("Alias Buddy"), NULL,
- secondary, buddy->alias, FALSE, FALSE, NULL,
+ secondary, purple_buddy_get_local_buddy_alias(buddy), FALSE, FALSE, NULL,
_("Alias"), G_CALLBACK(pidgin_dialogs_alias_buddy_cb),
_("Cancel"), NULL,
purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL,
@@ -1169,8 +1169,8 @@ pidgin_dialogs_remove_contact_cb(PurpleC
group = (PurpleGroup*)cnode->parent;
for (bnode = cnode->child; bnode; bnode = bnode->next) {
PurpleBuddy *buddy = (PurpleBuddy*)bnode;
- if (purple_account_is_connected(buddy->account))
- purple_account_remove_buddy(buddy->account, buddy, group);
+ if (purple_account_is_connected(purple_buddy_get_account(buddy)))
+ purple_account_remove_buddy(purple_buddy_get_account(buddy), buddy, group);
}
purple_blist_remove_contact(contact);
}
@@ -1196,7 +1196,7 @@ pidgin_dialogs_remove_contact(PurpleCont
"You are about to remove the contact containing %s "
"and %d other buddies from your buddy list. Do you "
"want to continue?", contact->totalsize - 1),
- buddy->name, contact->totalsize - 1);
+ purple_buddy_get_name(buddy), contact->totalsize - 1);
purple_request_action(contact, NULL, _("Remove Contact"), text, 0,
NULL, purple_contact_get_alias(contact), NULL,
@@ -1264,8 +1264,8 @@ pidgin_dialogs_remove_group_cb(PurpleGro
if (PURPLE_BLIST_NODE_IS_BUDDY(bnode)) {
buddy = (PurpleBuddy*)bnode;
bnode = bnode->next;
- if (purple_account_is_connected(buddy->account)) {
- purple_account_remove_buddy(buddy->account, buddy, group);
+ if (purple_account_is_connected(purple_buddy_get_account(buddy))) {
+ purple_account_remove_buddy(purple_buddy_get_account(buddy), buddy, group);
purple_blist_remove_buddy(buddy);
}
} else {
@@ -1313,10 +1313,10 @@ pidgin_dialogs_remove_buddy_cb(PurpleBud
PurpleAccount *account;
group = purple_buddy_get_group(buddy);
- name = g_strdup(buddy->name); /* b->name is a crasher after remove_buddy */
- account = buddy->account;
+ name = g_strdup(purple_buddy_get_name(buddy)); /* purple_buddy_get_name() is a crasher after remove_buddy */
+ account = purple_buddy_get_account(buddy);
- purple_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name);
+ purple_debug_info("blist", "Removing '%s' from buddy list.\n", purple_buddy_get_name(buddy));
/* TODO - Should remove from blist first... then call purple_account_remove_buddy()? */
purple_account_remove_buddy(account, buddy, group);
purple_blist_remove_buddy(buddy);
@@ -1332,7 +1332,7 @@ pidgin_dialogs_remove_buddy(PurpleBuddy
g_return_if_fail(buddy != NULL);
text = g_strdup_printf(_("You are about to remove %s from your buddy list. Do you want to continue?"),
- buddy->name);
+ purple_buddy_get_name(buddy));
purple_request_action(buddy, NULL, _("Remove Buddy"), text, 0,
purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL,
More information about the Commits
mailing list