--- a/pidgin/gtkconv.c Wed Jul 03 22:13:33 2013 +0530
+++ b/pidgin/gtkconv.c Wed Jul 03 22:18:55 2013 +0530
@@ -242,11 +242,11 @@
return &col;
}
-static PurpleBlistNode *
+static PurpleBListNode *
get_conversation_blist_node(PurpleConversation *conv)
{
PurpleAccount *account = purple_conversation_get_account(conv);
- PurpleBlistNode *node = NULL;
+ PurpleBListNode *node = NULL;
if (PURPLE_IS_IM_CONVERSATION(conv)) {
node = PURPLE_BLIST_NODE(purple_find_buddy(account, purple_conversation_get_name(conv)));
@@ -841,7 +841,7 @@
if (dnd_info == PIDGIN_DRAG_BLIST_NODE)
{
- PurpleBlistNode *node = NULL;
+ PurpleBListNode *node = NULL;
PurpleBuddy *buddy;
const guchar *data = gtk_selection_data_get_data(sd);
@@ -1140,7 +1140,7 @@
buddies = purple_find_buddies(account, name);
for (cur = buddies; cur != NULL; cur = cur->next)
{
- PurpleBlistNode *node = cur->data;
+ PurpleBListNode *node = cur->data;
if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
{
pidgin_log_show_contact((PurpleContact *)node->parent);
@@ -1391,7 +1391,7 @@
PidginWindow *win = data;
PurpleConversation *conv;
gboolean logging;
- PurpleBlistNode *node;
+ PurpleBListNode *node;
conv = pidgin_conv_window_get_active_conversation(win);
@@ -1453,7 +1453,7 @@
PidginWindow *win = data;
PurpleConversation *conv;
PidginConversation *gtkconv;
- PurpleBlistNode *node;
+ PurpleBListNode *node;
conv = pidgin_conv_window_get_active_conversation(win);
@@ -1735,8 +1735,8 @@
{
if (purple_account_is_connected(account))
pidgin_append_blist_node_proto_menu(menu, purple_account_get_connection(account),
- (PurpleBlistNode *)buddy);
- pidgin_append_blist_node_extended_menu(menu, (PurpleBlistNode *)buddy);
+ (PurpleBListNode *)buddy);
+ pidgin_append_blist_node_extended_menu(menu, (PurpleBListNode *)buddy);
gtk_widget_show_all(menu);
}
@@ -2566,7 +2566,7 @@
* displays in the conv tab even though it shouldn't.
* A better solution would be great. */
if (ops && ops->update)
- ops->update(NULL, (PurpleBlistNode*)b);
+ ops->update(NULL, (PurpleBListNode*)b);
}
}
@@ -2606,7 +2606,7 @@
if (PURPLE_IS_IM_CONVERSATION(conv)) {
PurpleBuddy *b = purple_find_buddy(purple_conversation_get_account(conv), purple_conversation_get_name(conv));
if (b)
- emblem = pidgin_blist_get_emblem((PurpleBlistNode*)b);
+ emblem = pidgin_blist_get_emblem((PurpleBListNode*)b);
}
g_return_if_fail(status != NULL);
@@ -2817,7 +2817,7 @@
}
contact = purple_buddy_get_contact(buddy);
- purple_buddy_icons_node_set_custom_icon_from_file((PurpleBlistNode*)contact, filename);
+ purple_buddy_icons_node_set_custom_icon_from_file((PurpleBListNode*)contact, filename);
}
}
@@ -2852,7 +2852,7 @@
for (; buddies; buddies = g_slist_delete_link(buddies, buddies)) {
PurpleBuddy *buddy = buddies->data;
PurpleContact *contact = purple_buddy_get_contact(buddy);
- purple_blist_node_set_int((PurpleBlistNode*)contact, "pidgin-infopane-iconsize", size);
+ purple_blist_node_set_int((PurpleBListNode*)contact, "pidgin-infopane-iconsize", size);
}
}
@@ -2873,7 +2873,7 @@
}
contact = purple_buddy_get_contact(buddy);
- purple_buddy_icons_node_set_custom_icon_from_file((PurpleBlistNode*)contact, NULL);
+ purple_buddy_icons_node_set_custom_icon_from_file((PurpleBListNode*)contact, NULL);
}
static void
@@ -2974,7 +2974,7 @@
if (buddy)
{
PurpleContact *contact = purple_buddy_get_contact(buddy);
- if (contact && purple_buddy_icons_node_has_custom_icon((PurpleBlistNode*)contact))
+ if (contact && purple_buddy_icons_node_has_custom_icon((PurpleBListNode*)contact))
{
pidgin_new_item_from_stock(menu, _("Remove Custom Icon"), NULL,
G_CALLBACK(remove_custom_icon_cb), gtkconv,
@@ -3254,7 +3254,7 @@
GList *list;
PurpleConversation *conv;
PurpleAccount *account;
- PurpleBlistNode *node = NULL;
+ PurpleBListNode *node = NULL;
PurpleChat *chat = NULL;
PurpleBuddy *buddy = NULL;
gboolean ret;
@@ -3285,7 +3285,7 @@
g_strdup(purple_conversation_get_name(conv)));
}
chat = purple_chat_new(account, NULL, components);
- purple_blist_node_set_flags((PurpleBlistNode *)chat,
+ purple_blist_node_set_flags((PurpleBListNode *)chat,
PURPLE_BLIST_NODE_FLAG_NO_SAVE);
g_object_set_data_full(G_OBJECT(gtkconv->webview), "transient_chat",
chat, (GDestroyNotify)purple_blist_remove_chat);
@@ -3300,7 +3300,7 @@
if (!buddy) {
buddy = purple_buddy_new(account, purple_conversation_get_name(conv), NULL);
- purple_blist_node_set_flags((PurpleBlistNode *)buddy,
+ purple_blist_node_set_flags((PurpleBListNode *)buddy,
PURPLE_BLIST_NODE_FLAG_NO_SAVE);
g_object_set_data_full(G_OBJECT(gtkconv->webview), "transient_buddy",
buddy, (GDestroyNotify)purple_buddy_destroy);
@@ -3309,9 +3309,9 @@
}
if (chat)
- node = (PurpleBlistNode *)chat;
+ node = (PurpleBListNode *)chat;
else if (buddy)
- node = (PurpleBlistNode *)buddy;
+ node = (PurpleBListNode *)buddy;
/* Now add the stuff */
if (all) {
@@ -4046,7 +4046,7 @@
GList *list = NULL, *iter;
for (l = buds; l != NULL; l = l->next)
{
- PurpleBlistNode *node;
+ PurpleBListNode *node;
node = PURPLE_BLIST_NODE(purple_buddy_get_contact(PURPLE_BUDDY(l->data)));
@@ -4602,7 +4602,7 @@
}
static void
-blist_node_aliased_cb(PurpleBlistNode *node, const char *old_alias, PurpleChatConversation *chat)
+blist_node_aliased_cb(PurpleBListNode *node, const char *old_alias, PurpleChatConversation *chat)
{
PurpleConnection *gc;
PurplePluginProtocolInfo *prpl_info;
@@ -4621,7 +4621,7 @@
if (PURPLE_IS_CONTACT(node))
{
- PurpleBlistNode *bnode;
+ PurpleBListNode *bnode;
for(bnode = node->child; bnode; bnode = bnode->next) {
@@ -4685,7 +4685,7 @@
g_free(normalized_name);
- blist_node_aliased_cb((PurpleBlistNode *)buddy, NULL, chat);
+ blist_node_aliased_cb((PurpleBListNode *)buddy, NULL, chat);
texttag = get_buddy_tag(chat, purple_buddy_get_name(buddy), 0, FALSE); /* XXX: do we want the normalized name? */
if (texttag) {
@@ -4694,7 +4694,7 @@
}
static void
-buddy_added_cb(PurpleBlistNode *node, PurpleChatConversation *chat)
+buddy_added_cb(PurpleBListNode *node, PurpleChatConversation *chat)
{
if (!PURPLE_IS_BUDDY(node))
return;
@@ -4703,7 +4703,7 @@
}
static void
-buddy_removed_cb(PurpleBlistNode *node, PurpleChatConversation *chat)
+buddy_removed_cb(PurpleBListNode *node, PurpleChatConversation *chat)
{
if (!PURPLE_IS_BUDDY(node))
return;
@@ -4874,7 +4874,7 @@
GtkTreeIter iter;
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkconv->u.chat->list));
PurpleConversation *conv = gtkconv->active_conv;
- PurpleBlistNode *node;
+ PurpleBListNode *node;
PurplePluginProtocolInfo *prpl_info;
PurpleAccount *account = purple_conversation_get_account(conv);
char *who = NULL;
@@ -4888,7 +4888,7 @@
gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &who, -1);
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(purple_account_get_connection(account)));
- node = (PurpleBlistNode*)(purple_find_buddy(purple_conversation_get_account(conv), who));
+ node = (PurpleBListNode*)(purple_find_buddy(purple_conversation_get_account(conv), who));
if (node && prpl_info && (prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME))
pidgin_blist_draw_tooltip(node, gtkconv->infopane);
@@ -4997,17 +4997,17 @@
static gboolean
pidgin_conv_create_tooltip(GtkWidget *tipwindow, gpointer userdata, int *w, int *h)
{
- PurpleBlistNode *node = NULL;
+ PurpleBListNode *node = NULL;
PurpleConversation *conv;
PidginConversation *gtkconv = userdata;
conv = gtkconv->active_conv;
if (PURPLE_IS_CHAT_CONVERSATION(conv)) {
- node = (PurpleBlistNode*)(purple_blist_find_chat(purple_conversation_get_account(conv), purple_conversation_get_name(conv)));
+ node = (PurpleBListNode*)(purple_blist_find_chat(purple_conversation_get_account(conv), purple_conversation_get_name(conv)));
if (!node)
node = g_object_get_data(G_OBJECT(gtkconv->webview), "transient_chat");
} else {
- node = (PurpleBlistNode*)(purple_find_buddy(purple_conversation_get_account(conv), purple_conversation_get_name(conv)));
+ node = (PurpleBListNode*)(purple_find_buddy(purple_conversation_get_account(conv), purple_conversation_get_name(conv)));
#if 0
/* Using the transient blist nodes to show the tooltip doesn't quite work yet. */
if (!node)
@@ -5383,7 +5383,7 @@
purple_conversation_get_name(conv))) != NULL) {
PurpleContact *contact = purple_buddy_get_contact(buddy);
if (contact) {
- buddyicon_size = purple_blist_node_get_int((PurpleBlistNode*)contact, "pidgin-infopane-iconsize");
+ buddyicon_size = purple_blist_node_get_int((PurpleBListNode*)contact, "pidgin-infopane-iconsize");
}
}
buddyicon_size = CLAMP(buddyicon_size, BUDDYICON_SIZE_MIN, BUDDYICON_SIZE_MAX);
@@ -5524,13 +5524,13 @@
if (info == PIDGIN_DRAG_BLIST_NODE)
{
- PurpleBlistNode *n = NULL;
+ PurpleBListNode *n = NULL;
PurpleBuddy *b;
PidginConversation *gtkconv = NULL;
PurpleAccount *buddyaccount;
const char *buddyname;
- n = *(PurpleBlistNode **) data;
+ n = *(PurpleBListNode **) data;
if (PURPLE_IS_CONTACT(n))
b = purple_contact_get_priority_buddy((PurpleContact*)n);
@@ -5638,7 +5638,7 @@
{
PurpleBuddy *bud = purple_find_buddy(purple_conversation_get_account(conv), purple_conversation_get_name(conv));
PurpleContact *c;
- PurpleBlistNode *cn, *bn;
+ PurpleBListNode *cn, *bn;
if (!bud)
return NULL;
@@ -5660,7 +5660,7 @@
}
static void
-buddy_update_cb(PurpleBlistNode *bnode, gpointer null)
+buddy_update_cb(PurpleBListNode *bnode, gpointer null)
{
GList *list;
@@ -5741,7 +5741,7 @@
gboolean is_chat = PURPLE_IS_CHAT_CONVERSATION(conv);
GtkWidget *pane = NULL;
GtkWidget *tab_cont;
- PurpleBlistNode *convnode;
+ PurpleBListNode *convnode;
GtkTargetList *targets;
if (!is_chat && (gtkconv = pidgin_conv_find_gtkconv(conv))) {
@@ -7697,7 +7697,7 @@
{
PurpleContact *contact = purple_buddy_get_contact(buddy);
if (contact) {
- custom_img = purple_buddy_icons_node_find_custom_icon((PurpleBlistNode*)contact);
+ custom_img = purple_buddy_icons_node_find_custom_icon((PurpleBListNode*)contact);
if (custom_img) {
/* There is a custom icon for this user */
data = purple_imgstore_get_data(custom_img);
@@ -8153,9 +8153,9 @@
static PidginConversation *
get_gtkconv_with_contact(PurpleContact *contact)
{
- PurpleBlistNode *node;
-
- node = ((PurpleBlistNode*)contact)->child;
+ PurpleBListNode *node;
+
+ node = ((PurpleBListNode*)contact)->child;
for (; node; node = node->next)
{