changeset
Renamed PurpleBlistNode to PurpleBListNode
Wed, 03 Jul 2013 22:18:55 +0530
- author
- Ankit Vani <a@nevitus.org>
- date
- Wed, 03 Jul 2013 22:18:55 +0530
- branch
- soc.2013.gobjectification
- changeset 34699
- 09b2c9219b57
- parent 34698
- e0bd77bd4508
- child 34700
- 8647eee83ed3
Renamed PurpleBlistNode to PurpleBListNode
--- a/finch/gntblist.c Wed Jul 03 22:13:33 2013 +0530 +++ b/finch/gntblist.c Wed Jul 03 22:18:55 2013 +0530 @@ -72,11 +72,11 @@ GntWidget *tree; GntWidget *tooltip; - PurpleBlistNode *tnode; /* Who is the tooltip being displayed for? */ + PurpleBListNode *tnode; /* Who is the tooltip being displayed for? */ GList *tagged; /* A list of tagged blistnodes */ GntWidget *context; - PurpleBlistNode *cnode; + PurpleBListNode *cnode; /* XXX: I am KISSing */ GntWidget *status; /* Dropdown with the statuses */ @@ -129,8 +129,8 @@ static void add_contact(PurpleContact *contact, FinchBlist *ggblist); static void add_group(PurpleGroup *group, FinchBlist *ggblist); static void add_chat(PurpleChat *chat, FinchBlist *ggblist); -static void add_node(PurpleBlistNode *node, FinchBlist *ggblist); -static void node_update(PurpleBuddyList *list, PurpleBlistNode *node); +static void add_node(PurpleBListNode *node, FinchBlist *ggblist); +static void node_update(PurpleBuddyList *list, PurpleBListNode *node); #if 0 static gboolean is_contact_online(PurpleContact *contact); static gboolean is_group_online(PurpleGroup *group); @@ -139,20 +139,20 @@ static void tooltip_for_buddy(PurpleBuddy *buddy, GString *str, gboolean full); static gboolean remove_typing_cb(gpointer null); static void remove_peripherals(FinchBlist *ggblist); -static const char * get_display_name(PurpleBlistNode *node); +static const char * get_display_name(PurpleBListNode *node); static void savedstatus_changed(PurpleSavedStatus *now, PurpleSavedStatus *old); static void blist_show(PurpleBuddyList *list); -static void update_node_display(PurpleBlistNode *buddy, FinchBlist *ggblist); +static void update_node_display(PurpleBListNode *buddy, FinchBlist *ggblist); static void update_buddy_display(PurpleBuddy *buddy, FinchBlist *ggblist); static gboolean account_autojoin_cb(PurpleConnection *pc, gpointer null); static void finch_request_add_buddy(PurpleAccount *account, const char *username, const char *grp, const char *alias); static void menu_group_set_cb(GntMenuItem *item, gpointer null); /* Sort functions */ -static int blist_node_compare_position(PurpleBlistNode *n1, PurpleBlistNode *n2); -static int blist_node_compare_text(PurpleBlistNode *n1, PurpleBlistNode *n2); -static int blist_node_compare_status(PurpleBlistNode *n1, PurpleBlistNode *n2); -static int blist_node_compare_log(PurpleBlistNode *n1, PurpleBlistNode *n2); +static int blist_node_compare_position(PurpleBListNode *n1, PurpleBListNode *n2); +static int blist_node_compare_text(PurpleBListNode *n1, PurpleBListNode *n2); +static int blist_node_compare_status(PurpleBListNode *n1, PurpleBListNode *n2); +static int blist_node_compare_log(PurpleBListNode *n1, PurpleBListNode *n2); static int color_available; static int color_away; @@ -163,7 +163,7 @@ * Buddy List Manager functions. */ -static gboolean default_can_add_node(PurpleBlistNode *node) +static gboolean default_can_add_node(PurpleBListNode *node) { gboolean offline = purple_prefs_get_bool(PREF_ROOT "/showoffline"); @@ -183,7 +183,7 @@ if (purple_blist_node_get_bool(node, "show_offline")) return TRUE; } else if (PURPLE_IS_CONTACT(node)) { - PurpleBlistNode *nd; + PurpleBListNode *nd; for (nd = purple_blist_node_get_first_child(node); nd; nd = purple_blist_node_get_sibling_next(nd)) { if (default_can_add_node(nd)) @@ -194,7 +194,7 @@ if (purple_account_is_connected(purple_chat_get_account(chat))) return TRUE; /* Show whenever the account is online */ } else if (PURPLE_IS_GROUP(node)) { - PurpleBlistNode *nd; + PurpleBListNode *nd; gboolean empty = purple_prefs_get_bool(PREF_ROOT "/emptygroups"); if (empty) return TRUE; /* If we want to see empty groups, we can show any group */ @@ -212,7 +212,7 @@ return FALSE; } -static gpointer default_find_parent(PurpleBlistNode *node) +static gpointer default_find_parent(PurpleBListNode *node) { gpointer ret = NULL; switch (purple_blist_node_get_type(node)) { @@ -232,7 +232,7 @@ static gboolean default_create_tooltip(gpointer selected_row, GString **body, char **tool_title) { GString *str; - PurpleBlistNode *node = selected_row; + PurpleBListNode *node = selected_row; int lastseen = 0; char *title; @@ -257,7 +257,7 @@ if (value > lastseen) lastseen = value; } - if (node == (PurpleBlistNode*)pr) + if (node == (PurpleBListNode*)pr) continue; if (!purple_account_is_connected(purple_buddy_get_account(buddy))) continue; @@ -327,7 +327,7 @@ static GList *managers; static FinchBlistNode * -create_finch_blist_node(PurpleBlistNode *node, gpointer row) +create_finch_blist_node(PurpleBListNode *node, gpointer row) { FinchBlistNode *fnode = purple_blist_node_get_ui_data(node); if (!fnode) { @@ -340,7 +340,7 @@ } static void -reset_blist_node_ui_data(PurpleBlistNode *node) +reset_blist_node_ui_data(PurpleBListNode *node) { FinchBlistNode *fnode = purple_blist_node_get_ui_data(node); if (fnode == NULL) @@ -352,7 +352,7 @@ } static int -get_display_color(PurpleBlistNode *node) +get_display_color(PurpleBListNode *node) { PurpleBuddy *buddy; int color = 0; @@ -378,7 +378,7 @@ } static GntTextFormatFlags -get_blist_node_flag(PurpleBlistNode *node) +get_blist_node_flag(PurpleBListNode *node) { GntTextFormatFlags flag = 0; FinchBlistNode *fnode = purple_blist_node_get_ui_data(node); @@ -404,7 +404,7 @@ if (!gnt_tree_get_expanded(GNT_TREE(ggblist->tree), node)) { for (node = purple_blist_node_get_first_child(node); node; node = purple_blist_node_get_sibling_next(node)) { - PurpleBlistNode *pnode; + PurpleBListNode *pnode; pnode = purple_contact_get_priority_buddy((PurpleContact*)node); fnode = purple_blist_node_get_ui_data(node); if (fnode && fnode->signed_timer) { @@ -420,7 +420,7 @@ } static void -blist_update_row_flags(PurpleBlistNode *node) +blist_update_row_flags(PurpleBListNode *node) { gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), node, get_blist_node_flag(node)); gnt_tree_set_row_color(GNT_TREE(ggblist->tree), node, get_display_color(node)); @@ -430,8 +430,8 @@ static gboolean is_contact_online(PurpleContact *contact) { - PurpleBlistNode *node; - for (node = purple_blist_node_get_first_child(((PurpleBlistNode*)contact)); node; + PurpleBListNode *node; + for (node = purple_blist_node_get_first_child(((PurpleBListNode*)contact)); node; node = purple_blist_node_get_sibling_next(node)) { FinchBlistNode *fnode = purple_blist_node_get_ui_data(node); if (PURPLE_IS_BUDDY_ONLINE((PurpleBuddy*)node) || @@ -444,8 +444,8 @@ static gboolean is_group_online(PurpleGroup *group) { - PurpleBlistNode *node; - for (node = purple_blist_node_get_first_child(((PurpleBlistNode*)group)); node; + PurpleBListNode *node; + for (node = purple_blist_node_get_first_child(((PurpleBListNode*)group)); node; node = purple_blist_node_get_sibling_next(node)) { if (PURPLE_IS_CHAT(node) && purple_account_is_connected(((PurpleChat *)node)->account)) @@ -458,12 +458,12 @@ #endif static void -new_node(PurpleBlistNode *node) +new_node(PurpleBListNode *node) { } static void -add_node(PurpleBlistNode *node, FinchBlist *ggblist) +add_node(PurpleBListNode *node, FinchBlist *ggblist) { if (purple_blist_node_get_ui_data(node)) return; @@ -483,7 +483,7 @@ draw_tooltip(ggblist); } -void finch_blist_manager_add_node(PurpleBlistNode *node) +void finch_blist_manager_add_node(PurpleBListNode *node) { add_node(node, ggblist); } @@ -497,10 +497,10 @@ } static void -node_remove(PurpleBuddyList *list, PurpleBlistNode *node) +node_remove(PurpleBuddyList *list, PurpleBListNode *node) { FinchBlist *ggblist = FINCH_GET_DATA(list); - PurpleBlistNode *parent; + PurpleBListNode *parent; if (ggblist == NULL || purple_blist_node_get_ui_data(node) == NULL) return; @@ -530,7 +530,7 @@ } static void -node_update(PurpleBuddyList *list, PurpleBlistNode *node) +node_update(PurpleBuddyList *list, PurpleBListNode *node) { /* It really looks like this should never happen ... but it does. This will at least emit a warning to the log when it @@ -555,7 +555,7 @@ if (PURPLE_IS_BUDDY(node)) { PurpleBuddy *buddy = (PurpleBuddy*)node; - add_node((PurpleBlistNode*)buddy, FINCH_GET_DATA(list)); + add_node((PurpleBListNode*)buddy, FINCH_GET_DATA(list)); node_update(list, purple_blist_node_get_parent(node)); } else if (PURPLE_IS_CHAT(node)) { add_node(node, FINCH_GET_DATA(list)); @@ -612,7 +612,7 @@ ggblist->new_group_timeout = 0; while (ggblist->new_group) { - PurpleBlistNode *group = ggblist->new_group->data; + PurpleBListNode *group = ggblist->new_group->data; ggblist->new_group = g_list_delete_link(ggblist->new_group, ggblist->new_group); node_update(list, group); } @@ -765,7 +765,7 @@ } purple_blist_add_chat(chat, grp, NULL); purple_blist_alias_chat(chat, alias); - purple_blist_node_set_bool((PurpleBlistNode*)chat, "gnt-autojoin", autojoin); + purple_blist_node_set_bool((PurpleBListNode*)chat, "gnt-autojoin", autojoin); if (autojoin) { join_chat(chat); } @@ -838,9 +838,9 @@ /* Select the group */ if (ggblist->tree) { - FinchBlistNode *fnode = purple_blist_node_get_ui_data((PurpleBlistNode*)grp); + FinchBlistNode *fnode = purple_blist_node_get_ui_data((PurpleBListNode*)grp); if (!fnode) - add_node((PurpleBlistNode*)grp, ggblist); + add_node((PurpleBListNode*)grp, ggblist); gnt_tree_set_selected(GNT_TREE(ggblist->tree), grp); } } @@ -885,10 +885,10 @@ add_group(PurpleGroup *group, FinchBlist *ggblist) { gpointer parent; - PurpleBlistNode *node = (PurpleBlistNode *)group; + PurpleBListNode *node = (PurpleBListNode *)group; if (purple_blist_node_get_ui_data(node)) return; - parent = ggblist->manager->find_parent((PurpleBlistNode*)group); + parent = ggblist->manager->find_parent((PurpleBListNode*)group); create_finch_blist_node(node, gnt_tree_add_row_after(GNT_TREE(ggblist->tree), group, gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)), parent, NULL)); @@ -897,7 +897,7 @@ } static const char * -get_display_name(PurpleBlistNode *node) +get_display_name(PurpleBListNode *node) { static char text[2096]; char status[8] = " "; @@ -958,13 +958,13 @@ add_chat(PurpleChat *chat, FinchBlist *ggblist) { gpointer parent; - PurpleBlistNode *node = (PurpleBlistNode *)chat; + PurpleBListNode *node = (PurpleBListNode *)chat; if (purple_blist_node_get_ui_data(node)) return; if (!purple_account_is_connected(purple_chat_get_account(chat))) return; - parent = ggblist->manager->find_parent((PurpleBlistNode*)chat); + parent = ggblist->manager->find_parent((PurpleBListNode*)chat); create_finch_blist_node(node, gnt_tree_add_row_after(GNT_TREE(ggblist->tree), chat, gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)), @@ -975,7 +975,7 @@ add_contact(PurpleContact *contact, FinchBlist *ggblist) { gpointer parent; - PurpleBlistNode *node = (PurpleBlistNode*)contact; + PurpleBListNode *node = (PurpleBListNode*)contact; const char *name; if (purple_blist_node_get_ui_data(node)) @@ -985,7 +985,7 @@ if (name == NULL) return; - parent = ggblist->manager->find_parent((PurpleBlistNode*)contact); + parent = ggblist->manager->find_parent((PurpleBListNode*)contact); create_finch_blist_node(node, gnt_tree_add_row_after(GNT_TREE(ggblist->tree), contact, gnt_tree_create_row(GNT_TREE(ggblist->tree), name), @@ -998,35 +998,35 @@ add_buddy(PurpleBuddy *buddy, FinchBlist *ggblist) { gpointer parent; - PurpleBlistNode *node = (PurpleBlistNode *)buddy; + PurpleBListNode *node = (PurpleBListNode *)buddy; PurpleContact *contact; if (purple_blist_node_get_ui_data(node)) return; contact = purple_buddy_get_contact(buddy); - parent = ggblist->manager->find_parent((PurpleBlistNode*)buddy); + parent = ggblist->manager->find_parent((PurpleBListNode*)buddy); create_finch_blist_node(node, gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy, gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)), parent, NULL)); - blist_update_row_flags((PurpleBlistNode*)buddy); + blist_update_row_flags((PurpleBListNode*)buddy); if (buddy == purple_contact_get_priority_buddy(contact)) - blist_update_row_flags((PurpleBlistNode*)contact); + blist_update_row_flags((PurpleBListNode*)contact); } #if 0 static void buddy_signed_on(PurpleBuddy *buddy, FinchBlist *ggblist) { - add_node((PurpleBlistNode*)buddy, ggblist); + add_node((PurpleBListNode*)buddy, ggblist); } static void buddy_signed_off(PurpleBuddy *buddy, FinchBlist *ggblist) { - node_remove(purple_get_blist(), (PurpleBlistNode*)buddy); + node_remove(purple_get_blist(), (PurpleBListNode*)buddy); } #endif @@ -1039,7 +1039,7 @@ selection_activate(GntWidget *widget, FinchBlist *ggblist) { GntTree *tree = GNT_TREE(ggblist->tree); - PurpleBlistNode *node = gnt_tree_get_selection_data(tree); + PurpleBListNode *node = gnt_tree_get_selection_data(tree); if (!node) return; @@ -1069,7 +1069,7 @@ } static void -append_proto_menu(GntMenu *menu, PurpleConnection *gc, PurpleBlistNode *node) +append_proto_menu(GntMenu *menu, PurpleConnection *gc, PurpleBListNode *node) { GList *list; PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); @@ -1124,7 +1124,7 @@ } static void -chat_components_edit(PurpleBlistNode *selected, PurpleChat *chat) +chat_components_edit(PurpleBListNode *selected, PurpleChat *chat) { PurpleRequestFields *fields = purple_request_fields_new(); PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL); @@ -1183,7 +1183,7 @@ GntMenuItem *check = gnt_menuitem_check_new( purple_menu_action_get_label(action)); gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(check), - purple_blist_node_get_bool((PurpleBlistNode*)chat, "gnt-autojoin")); + purple_blist_node_get_bool((PurpleBListNode*)chat, "gnt-autojoin")); gnt_menu_add_item(menu, check); gnt_menuitem_set_callback(check, autojoin_toggled, action); g_signal_connect_swapped(G_OBJECT(menu), "destroy", @@ -1193,19 +1193,19 @@ } static void -finch_add_buddy(PurpleBlistNode *selected, PurpleGroup *grp) +finch_add_buddy(PurpleBListNode *selected, PurpleGroup *grp) { purple_blist_request_add_buddy(NULL, NULL, grp ? purple_group_get_name(grp) : NULL, NULL); } static void -finch_add_group(PurpleBlistNode *selected, PurpleGroup *grp) +finch_add_group(PurpleBListNode *selected, PurpleGroup *grp) { purple_blist_request_add_group(); } static void -finch_add_chat(PurpleBlistNode *selected, PurpleGroup *grp) +finch_add_chat(PurpleBListNode *selected, PurpleGroup *grp) { purple_blist_request_add_chat(NULL, grp, NULL, NULL); } @@ -1234,19 +1234,19 @@ } static void -finch_blist_get_buddy_info_cb(PurpleBlistNode *selected, PurpleBuddy *buddy) +finch_blist_get_buddy_info_cb(PurpleBListNode *selected, PurpleBuddy *buddy) { finch_retrieve_user_info(purple_account_get_connection(purple_buddy_get_account(buddy)), purple_buddy_get_name(buddy)); } static void -finch_blist_menu_send_file_cb(PurpleBlistNode *selected, PurpleBuddy *buddy) +finch_blist_menu_send_file_cb(PurpleBListNode *selected, PurpleBuddy *buddy) { serv_send_file(purple_account_get_connection(purple_buddy_get_account(buddy)), purple_buddy_get_name(buddy), NULL); } static void -finch_blist_pounce_node_cb(PurpleBlistNode *selected, PurpleBlistNode *node) +finch_blist_pounce_node_cb(PurpleBListNode *selected, PurpleBListNode *node) { PurpleBuddy *b; if (PURPLE_IS_CONTACT(node)) @@ -1314,18 +1314,18 @@ gnt_menu_add_item(menu, item); item = gnt_menuitem_check_new(_("Show when offline")); - gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item), purple_blist_node_get_bool((PurpleBlistNode*)buddy, "show_offline")); + gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item), purple_blist_node_get_bool((PurpleBListNode*)buddy, "show_offline")); gnt_menuitem_set_callback(item, toggle_show_offline, buddy); gnt_menu_add_item(menu, item); /* Protocol actions */ append_proto_menu(menu, purple_account_get_connection(purple_buddy_get_account(buddy)), - (PurpleBlistNode*)buddy); + (PurpleBListNode*)buddy); } static void -append_extended_menu(GntMenu *menu, PurpleBlistNode *node) +append_extended_menu(GntMenu *menu, PurpleBListNode *node) { GList *iter; @@ -1340,10 +1340,10 @@ static void remove_contact(PurpleContact *contact) { - PurpleBlistNode *bnode, *cnode; + PurpleBListNode *bnode, *cnode; PurpleGroup *group; - cnode = (PurpleBlistNode *)contact; + cnode = (PurpleBListNode *)contact; group = (PurpleGroup*)purple_blist_node_get_parent(cnode); for (bnode = purple_blist_node_get_first_child(cnode); bnode; bnode = purple_blist_node_get_sibling_next(bnode)) { PurpleBuddy *buddy = (PurpleBuddy*)bnode; @@ -1355,7 +1355,7 @@ } static void -rename_blist_node(PurpleBlistNode *node, const char *newname) +rename_blist_node(PurpleBListNode *node, const char *newname) { const char *name = newname; if (name && !*name) @@ -1379,7 +1379,7 @@ } static void -finch_blist_rename_node_cb(PurpleBlistNode *selected, PurpleBlistNode *node) +finch_blist_rename_node_cb(PurpleBListNode *selected, PurpleBListNode *node) { const char *name = NULL; char *prompt; @@ -1409,7 +1409,7 @@ } -static void showlog_cb(PurpleBlistNode *sel, PurpleBlistNode *node) +static void showlog_cb(PurpleBListNode *sel, PurpleBListNode *node) { PurpleLogType type; PurpleAccount *account; @@ -1449,9 +1449,9 @@ static void remove_group(PurpleGroup *group) { - PurpleBlistNode *cnode, *bnode; - - cnode = purple_blist_node_get_first_child(((PurpleBlistNode*)group)); + PurpleBListNode *cnode, *bnode; + + cnode = purple_blist_node_get_first_child(((PurpleBListNode*)group)); while (cnode) { if (PURPLE_IS_CONTACT(cnode)) { @@ -1486,7 +1486,7 @@ } static void -finch_blist_remove_node(PurpleBlistNode *node) +finch_blist_remove_node(PurpleBListNode *node) { if (PURPLE_IS_CONTACT(node)) { remove_contact((PurpleContact*)node); @@ -1503,7 +1503,7 @@ } static void -finch_blist_remove_node_cb(PurpleBlistNode *selected, PurpleBlistNode *node) +finch_blist_remove_node_cb(PurpleBListNode *selected, PurpleBListNode *node) { PurpleAccount *account = NULL; char *primary; @@ -1540,7 +1540,7 @@ } static void -finch_blist_toggle_tag_buddy(PurpleBlistNode *node) +finch_blist_toggle_tag_buddy(PurpleBListNode *node) { GList *iter; if (node == NULL) @@ -1559,7 +1559,7 @@ } static void -finch_blist_place_tagged(PurpleBlistNode *target) +finch_blist_place_tagged(PurpleBListNode *target) { PurpleGroup *tg = NULL; PurpleContact *tc = NULL; @@ -1572,7 +1572,7 @@ tg = (PurpleGroup*)target; else if (PURPLE_IS_BUDDY(target)) { tc = (PurpleContact*)purple_blist_node_get_parent(target); - tg = (PurpleGroup*)purple_blist_node_get_parent((PurpleBlistNode*)tc); + tg = (PurpleGroup*)purple_blist_node_get_parent((PurpleBListNode*)tc); } else { if (PURPLE_IS_CONTACT(target)) tc = (PurpleContact*)target; @@ -1583,13 +1583,13 @@ GList *list = ggblist->tagged; ggblist->tagged = NULL; while (list) { - PurpleBlistNode *node = list->data; + PurpleBListNode *node = list->data; list = g_list_delete_link(list, list); if (PURPLE_IS_GROUP(node)) { update_node_display(node, ggblist); /* Add the group after the current group */ - purple_blist_add_group((PurpleGroup*)node, (PurpleBlistNode*)tg); + purple_blist_add_group((PurpleGroup*)node, (PurpleBListNode*)tg); } else if (PURPLE_IS_CONTACT(node)) { update_buddy_display(purple_contact_get_priority_buddy((PurpleContact*)node), ggblist); if (PURPLE_BLIST_NODE(tg) == target) { @@ -1597,7 +1597,7 @@ purple_blist_add_contact((PurpleContact*)node, tg, NULL); } else if (tc) { /* The target is either a buddy, or a contact. Merge with that contact. */ - purple_blist_merge_contact((PurpleContact*)node, (PurpleBlistNode*)tc); + purple_blist_merge_contact((PurpleContact*)node, (PurpleBListNode*)tc); } else { /* The target is a chat. Add the contact to the group after this chat. */ purple_blist_add_contact((PurpleContact*)node, NULL, target); @@ -1637,7 +1637,7 @@ static void draw_context_menu(FinchBlist *ggblist) { - PurpleBlistNode *node = NULL; + PurpleBListNode *node = NULL; GntWidget *context = NULL; GntTree *tree = NULL; int x, y, top, width; @@ -1793,7 +1793,7 @@ static gboolean draw_tooltip_real(FinchBlist *ggblist) { - PurpleBlistNode *node; + PurpleBListNode *node; int x, y, top, width, w, h; GString *str = NULL; GntTree *tree; @@ -1896,7 +1896,7 @@ gnt_bindable_perform_action_named(GNT_BINDABLE(ggblist->tree), "end-search", NULL); remove_peripherals(ggblist); } else if (strcmp(text, GNT_KEY_INS) == 0) { - PurpleBlistNode *node = gnt_tree_get_selection_data(GNT_TREE(ggblist->tree)); + PurpleBListNode *node = gnt_tree_get_selection_data(GNT_TREE(ggblist->tree)); purple_blist_request_add_buddy(NULL, NULL, node && PURPLE_IS_GROUP(node) ? purple_group_get_name(PURPLE_GROUP(node)) : NULL, NULL); @@ -1915,7 +1915,7 @@ } static void -update_node_display(PurpleBlistNode *node, FinchBlist *ggblist) +update_node_display(PurpleBListNode *node, FinchBlist *ggblist) { GntTextFormatFlags flag = get_blist_node_flag(node); gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), node, flag); @@ -1928,14 +1928,14 @@ contact = purple_buddy_get_contact(buddy); - gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, 0, get_display_name((PurpleBlistNode*)buddy)); - gnt_tree_change_text(GNT_TREE(ggblist->tree), contact, 0, get_display_name((PurpleBlistNode*)contact)); - - blist_update_row_flags((PurpleBlistNode *)buddy); + gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, 0, get_display_name((PurpleBListNode*)buddy)); + gnt_tree_change_text(GNT_TREE(ggblist->tree), contact, 0, get_display_name((PurpleBListNode*)contact)); + + blist_update_row_flags((PurpleBListNode *)buddy); if (buddy == purple_contact_get_priority_buddy(contact)) - blist_update_row_flags((PurpleBlistNode *)contact); - - if (ggblist->tnode == (PurpleBlistNode*)buddy) + blist_update_row_flags((PurpleBListNode *)contact); + + if (ggblist->tnode == (PurpleBListNode*)buddy) draw_tooltip(ggblist); } @@ -1979,7 +1979,7 @@ static void reset_blist_window(GntWidget *window, gpointer null) { - PurpleBlistNode *node; + PurpleBListNode *node; purple_signals_disconnect_by_handle(finch_blist_get_handle()); FINCH_SET_DATA(purple_get_blist(), NULL); @@ -2007,7 +2007,7 @@ static void populate_buddylist(void) { - PurpleBlistNode *node; + PurpleBListNode *node; PurpleBuddyList *list; if (ggblist->manager->init) @@ -2099,7 +2099,7 @@ static void redraw_blist(const char *name, PurplePrefType type, gconstpointer val, gpointer data) { - PurpleBlistNode *node, *sel; + PurpleBListNode *node, *sel; FinchBlistManager *manager; if (ggblist == NULL) @@ -2340,7 +2340,7 @@ } static int -blist_node_compare_position(PurpleBlistNode *n1, PurpleBlistNode *n2) +blist_node_compare_position(PurpleBListNode *n1, PurpleBListNode *n2) { while ((n1 = purple_blist_node_get_sibling_prev(n1)) != NULL) if (n1 == n2) @@ -2349,7 +2349,7 @@ } static int -blist_node_compare_text(PurpleBlistNode *n1, PurpleBlistNode *n2) +blist_node_compare_text(PurpleBListNode *n1, PurpleBListNode *n2) { const char *s1, *s2; char *us1, *us2; @@ -2386,7 +2386,7 @@ } static int -blist_node_compare_status(PurpleBlistNode *n1, PurpleBlistNode *n2) +blist_node_compare_status(PurpleBListNode *n1, PurpleBListNode *n2) { int ret; @@ -2416,10 +2416,10 @@ } static int -get_contact_log_size(PurpleBlistNode *c) +get_contact_log_size(PurpleBListNode *c) { int log = 0; - PurpleBlistNode *node; + PurpleBListNode *node; for (node = purple_blist_node_get_first_child(c); node; node = purple_blist_node_get_sibling_next(node)) { PurpleBuddy *b = (PurpleBuddy*)node; @@ -2431,7 +2431,7 @@ } static int -blist_node_compare_log(PurpleBlistNode *n1, PurpleBlistNode *n2) +blist_node_compare_log(PurpleBListNode *n1, PurpleBListNode *n2) { int ret; PurpleBuddy *b1, *b2; @@ -2495,7 +2495,7 @@ static gboolean buddy_recent_signed_on_off(gpointer data) { - PurpleBlistNode *node = data; + PurpleBListNode *node = data; FinchBlistNode *fnode = purple_blist_node_get_ui_data(node); purple_timeout_remove(fnode->signed_timer); @@ -2515,7 +2515,7 @@ static gboolean buddy_signed_on_off_cb(gpointer data) { - PurpleBlistNode *node = data; + PurpleBListNode *node = data; FinchBlistNode *fnode = purple_blist_node_get_ui_data(node); if (!ggblist || !fnode) return FALSE; @@ -2629,7 +2629,7 @@ static gboolean auto_join_chats(gpointer data) { - PurpleBlistNode *node; + PurpleBListNode *node; PurpleConnection *pc = data; PurpleAccount *account = purple_connection_get_account(pc); @@ -3057,7 +3057,7 @@ } static void -group_collapsed(GntWidget *widget, PurpleBlistNode *node, gboolean collapsed, gpointer null) +group_collapsed(GntWidget *widget, PurpleBListNode *node, gboolean collapsed, gpointer null) { if (PURPLE_IS_GROUP(node)) purple_blist_node_set_bool(node, "collapsed", collapsed);
--- a/finch/gntblist.h Wed Jul 03 22:13:33 2013 +0530 +++ b/finch/gntblist.h Wed Jul 03 22:18:55 2013 +0530 @@ -44,8 +44,8 @@ const char *name; /**< Displayable name for the manager. */ gboolean (*init)(void); /**< Called right before it's being used. */ gboolean (*uninit)(void); /**< Called right after it's not being used any more. */ - gboolean (*can_add_node)(PurpleBlistNode *node); /**< Whether a node should be added to the view. */ - gpointer (*find_parent)(PurpleBlistNode *node); /**< Find the parent row for a node. */ + gboolean (*can_add_node)(PurpleBListNode *node); /**< Whether a node should be added to the view. */ + gpointer (*find_parent)(PurpleBListNode *node); /**< Find the parent row for a node. */ gboolean (*create_tooltip)(gpointer selected_row, GString **body, char **title); /**< Create tooltip for a selected row. */ gpointer reserved[4]; } FinchBlistManager; @@ -152,7 +152,7 @@ * * @param node The node to add */ -void finch_blist_manager_add_node(PurpleBlistNode *node); +void finch_blist_manager_add_node(PurpleBListNode *node); /*@}*/
--- a/finch/gntconv.c Wed Jul 03 22:13:33 2013 +0530 +++ b/finch/gntconv.c Wed Jul 03 22:18:55 2013 +0530 @@ -89,16 +89,16 @@ purple_conversation_get_name(conv)); } -static PurpleBlistNode * +static PurpleBListNode * get_conversation_blist_node(PurpleConversation *conv) { - PurpleBlistNode *node = NULL; + PurpleBListNode *node = NULL; if (PURPLE_IS_IM_CONVERSATION(conv)) { - node = (PurpleBlistNode*)find_buddy_for_conversation(conv); + node = (PurpleBListNode*)find_buddy_for_conversation(conv); node = node ? purple_blist_node_get_parent(node) : NULL; } else { - node = (PurpleBlistNode*)find_chat_for_conversation(conv); + node = (PurpleBListNode*)find_chat_for_conversation(conv); } return node; @@ -229,16 +229,16 @@ static PurpleIMConversation * find_im_with_contact(PurpleAccount *account, const char *name) { - PurpleBlistNode *node; + PurpleBListNode *node; PurpleBuddy *buddy = purple_find_buddy(account, name); PurpleIMConversation *im = NULL; if (!buddy) return NULL; - for (node = purple_blist_node_get_first_child(purple_blist_node_get_parent((PurpleBlistNode*)buddy)); + for (node = purple_blist_node_get_first_child(purple_blist_node_get_parent((PurpleBListNode*)buddy)); node; node = purple_blist_node_get_sibling_next(node)) { - if (node == (PurpleBlistNode*)buddy) + if (node == (PurpleBListNode*)buddy) continue; if ((im = purple_conversations_find_im_with_account( purple_buddy_get_name((PurpleBuddy*)node), purple_buddy_get_account((PurpleBuddy*)node))) != NULL) @@ -492,7 +492,7 @@ toggle_sound_cb(GntMenuItem *item, gpointer ggconv) { FinchConv *fc = ggconv; - PurpleBlistNode *node = get_conversation_blist_node(fc->active_conv); + PurpleBListNode *node = get_conversation_blist_node(fc->active_conv); fc->flags ^= FINCH_CONV_NO_SOUND; if (node) purple_blist_node_set_bool(node, "gnt-mute-sound", !!(fc->flags & FINCH_CONV_NO_SOUND)); @@ -531,7 +531,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) && (purple_blist_node_get_sibling_prev(node) || purple_blist_node_get_sibling_next(node))) { finch_log_show_contact((PurpleContact *)purple_blist_node_get_parent(node)); @@ -566,7 +566,7 @@ gnt_menuitem_set_submenu(item, GNT_MENU(sub)); for (; buds; buds = g_slist_delete_link(buds, buds)) { - PurpleBlistNode *node = PURPLE_BLIST_NODE(purple_buddy_get_contact(PURPLE_BUDDY(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; @@ -774,7 +774,7 @@ char *title; PurpleConversation *cc; PurpleAccount *account; - PurpleBlistNode *convnode = NULL; + PurpleBListNode *convnode = NULL; if (ggc) { gnt_window_present(ggc->window);
--- a/finch/gntlog.c Wed Jul 03 22:13:33 2013 +0530 +++ b/finch/gntlog.c Wed Jul 03 22:18:55 2013 +0530 @@ -436,7 +436,7 @@ void finch_log_show_contact(PurpleContact *contact) { struct log_viewer_hash_t *ht; - PurpleBlistNode *child; + PurpleBListNode *child; FinchLogViewer *lv = NULL; GList *logs = NULL; const char *name = NULL; @@ -457,7 +457,7 @@ return; } - for (child = purple_blist_node_get_first_child((PurpleBlistNode*)contact); child; + for (child = purple_blist_node_get_first_child((PurpleBListNode*)contact); child; child = purple_blist_node_get_sibling_next(child)) { const char *name; PurpleAccount *account; @@ -480,7 +480,7 @@ * and none of the contact's buddies are online. * There is probably a better way to deal with this. */ if (name == NULL) { - child = purple_blist_node_get_first_child((PurpleBlistNode*)contact); + child = purple_blist_node_get_first_child((PurpleBListNode*)contact); if (child != NULL && PURPLE_IS_BUDDY(child)) name = purple_buddy_get_contact_alias((PurpleBuddy *)child); if (name == NULL)
--- a/finch/gntpounce.c Wed Jul 03 22:13:33 2013 +0530 +++ b/finch/gntpounce.c Wed Jul 03 22:18:55 2013 +0530 @@ -171,7 +171,7 @@ static void setup_buddy_list_suggestion(GntEntry *entry, gboolean offline) { - PurpleBlistNode *node = purple_blist_get_root(); + PurpleBListNode *node = purple_blist_get_root(); for (; node; node = purple_blist_node_next(node, offline)) { if (!PURPLE_IS_BUDDY(node)) continue;
--- a/finch/gntrequest.c Wed Jul 03 22:13:33 2013 +0530 +++ b/finch/gntrequest.c Wed Jul 03 22:18:55 2013 +0530 @@ -440,7 +440,7 @@ gnt_entry_set_masked(GNT_ENTRY(entry), purple_request_field_string_is_masked(field)); if (hint && purple_str_has_prefix(hint, "screenname")) { - PurpleBlistNode *node = purple_blist_get_root(); + PurpleBListNode *node = purple_blist_get_root(); gboolean offline = purple_str_has_suffix(hint, "all"); for (; node; node = purple_blist_node_next(node, offline)) { if (!PURPLE_IS_BUDDY(node)) @@ -451,7 +451,7 @@ if (username) *username = entry; } else if (hint && !strcmp(hint, "group")) { - PurpleBlistNode *node; + PurpleBListNode *node; for (node = purple_blist_get_root(); node; node = purple_blist_node_get_sibling_next(node)) { if (PURPLE_IS_GROUP(node))
--- a/finch/plugins/gnthistory.c Wed Jul 03 22:13:33 2013 +0530 +++ b/finch/plugins/gnthistory.c Wed Jul 03 22:18:55 2013 +0530 @@ -70,11 +70,11 @@ alias = purple_buddy_get_contact_alias((PurpleBuddy *)buddies->data); for (cur = buddies; cur != NULL; cur = cur->next) { - PurpleBlistNode *node = cur->data; + PurpleBListNode *node = cur->data; if ((node != NULL) && ((purple_blist_node_get_sibling_prev(node) != NULL) || (purple_blist_node_get_sibling_next(node) != NULL))) { - PurpleBlistNode *node2; + PurpleBListNode *node2; alias = purple_buddy_get_contact_alias((PurpleBuddy *)node);
--- a/finch/plugins/grouping.c Wed Jul 03 22:13:33 2013 +0530 +++ b/finch/plugins/grouping.c Wed Jul 03 22:18:55 2013 +0530 @@ -33,7 +33,7 @@ /** * Online/Offline */ -static PurpleBlistNode online = {.type = PURPLE_BLIST_OTHER_NODE}, +static PurpleBListNode online = {.type = PURPLE_BLIST_OTHER_NODE}, offline = {.type = PURPLE_BLIST_OTHER_NODE}; static gboolean on_offline_init() @@ -48,7 +48,7 @@ return TRUE; } -static gboolean on_offline_can_add_node(PurpleBlistNode *node) +static gboolean on_offline_can_add_node(PurpleBListNode *node) { switch (purple_blist_node_get_type(node)) { case PURPLE_BLIST_CONTACT_NODE: @@ -81,7 +81,7 @@ } } -static gpointer on_offline_find_parent(PurpleBlistNode *node) +static gpointer on_offline_find_parent(PurpleBListNode *node) { gpointer ret = NULL; @@ -105,7 +105,7 @@ static gboolean on_offline_create_tooltip(gpointer selected_row, GString **body, char **tool_title) { - PurpleBlistNode *node = selected_row; + PurpleBListNode *node = selected_row; if (purple_blist_node_get_type(node) == PURPLE_BLIST_OTHER_NODE) { /* There should be some easy way of getting the total online count, @@ -134,7 +134,7 @@ /** * Meebo-like Grouping. */ -static PurpleBlistNode meebo = {.type = PURPLE_BLIST_OTHER_NODE}; +static PurpleBListNode meebo = {.type = PURPLE_BLIST_OTHER_NODE}; static gboolean meebo_init() { GntTree *tree = finch_blist_get_tree(); @@ -145,7 +145,7 @@ return TRUE; } -static gpointer meebo_find_parent(PurpleBlistNode *node) +static gpointer meebo_find_parent(PurpleBListNode *node) { if (PURPLE_IS_CONTACT(node)) { PurpleBuddy *buddy = purple_contact_get_priority_buddy((PurpleContact*)node); @@ -185,12 +185,12 @@ return TRUE; } -static gboolean no_group_can_add_node(PurpleBlistNode *node) +static gboolean no_group_can_add_node(PurpleBListNode *node) { return on_offline_can_add_node(node); /* These happen to be the same */ } -static gpointer no_group_find_parent(PurpleBlistNode *node) +static gpointer no_group_find_parent(PurpleBListNode *node) { gpointer ret = NULL; @@ -239,12 +239,12 @@ } static gpointer -nested_group_find_parent(PurpleBlistNode *node) +nested_group_find_parent(PurpleBListNode *node) { char *name; PurpleGroup *group; char *sep; - PurpleBlistNode *ret, *parent; + PurpleBListNode *ret, *parent; GntTree *tree; if (!PURPLE_IS_GROUP(node)) @@ -262,11 +262,11 @@ while (sep) { *sep = 0; - if (*(sep + 1) && (ret = (PurpleBlistNode *)purple_find_group(name))) { + if (*(sep + 1) && (ret = (PurpleBListNode *)purple_find_group(name))) { finch_blist_manager_add_node(ret); parent = ret; } else if (!(ret = g_hash_table_lookup(groups, name))) { - ret = g_new0(PurpleBlistNode, 1); + ret = g_new0(PurpleBListNode, 1); g_hash_table_insert(groups, g_strdup(name), ret); ret->type = PURPLE_BLIST_OTHER_NODE; gnt_tree_add_row_last(tree, ret, @@ -284,7 +284,7 @@ static gboolean nested_group_create_tooltip(gpointer selected_row, GString **body, char **title) { - PurpleBlistNode *node = selected_row; + PurpleBListNode *node = selected_row; if (!node || purple_blist_node_get_type(node) != PURPLE_BLIST_OTHER_NODE) return default_manager->create_tooltip(selected_row, body, title); @@ -294,9 +294,9 @@ } static gboolean -nested_group_can_add_node(PurpleBlistNode *node) +nested_group_can_add_node(PurpleBListNode *node) { - PurpleBlistNode *group; + PurpleBListNode *group; int len; if (!PURPLE_IS_GROUP(node))
--- a/libpurple/account.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/account.h Wed Jul 03 22:18:55 2013 +0530 @@ -1076,7 +1076,7 @@ * Adds a list of buddies to the server-side buddy list. * * @param account The account. - * @param buddies The list of PurpleBlistNodes representing the buddies to add. + * @param buddies The list of PurpleBListNodes representing the buddies to add. * @param message The invite message. This may be ignored by a prpl. */ void purple_account_add_buddies(PurpleAccount *account, GList *buddies, const char *message);
--- a/libpurple/accounts.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/accounts.c Wed Jul 03 22:18:55 2013 +0530 @@ -643,7 +643,7 @@ void purple_accounts_delete(PurpleAccount *account) { - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; GList *iter; g_return_if_fail(account != NULL); @@ -671,12 +671,12 @@ cnode = purple_blist_node_get_first_child(gnode); while (cnode) { - PurpleBlistNode *cnode_next = purple_blist_node_get_sibling_next(cnode); + PurpleBListNode *cnode_next = purple_blist_node_get_sibling_next(cnode); if(PURPLE_IS_CONTACT(cnode)) { bnode = purple_blist_node_get_first_child(cnode); while (bnode) { - PurpleBlistNode *bnode_next = purple_blist_node_get_sibling_next(bnode); + PurpleBListNode *bnode_next = purple_blist_node_get_sibling_next(bnode); if (PURPLE_IS_BUDDY(bnode)) { PurpleBuddy *b = (PurpleBuddy *)bnode;
--- a/libpurple/blist.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/blist.c Wed Jul 03 22:18:55 2013 +0530 @@ -38,7 +38,7 @@ #include "xmlnode.h" /** Private data of a buddy list node */ -struct _PurpleBlistNodePrivate { +struct _PurpleBListNodePrivate { GHashTable *settings; /**< per-node settings */ gboolean dont_save; /**< node should not be saved with the buddy list */ @@ -92,7 +92,7 @@ /** Private data for the buddy list */ struct _PurpleBuddyListPrivate { - PurpleBlistNode *root; /**< The first node in the buddy list */ + PurpleBListNode *root; /**< The first node in the buddy list */ GHashTable *buddies; /**< Every buddy (no pun intended) in this list */ }; @@ -120,9 +120,9 @@ * Private utility functions * *********************************************************************/ -static PurpleBlistNode *purple_blist_get_last_sibling(PurpleBlistNode *node) +static PurpleBListNode *purple_blist_get_last_sibling(PurpleBListNode *node) { - PurpleBlistNode *n = node; + PurpleBListNode *n = node; if (!n) return NULL; while (n->next) @@ -130,7 +130,7 @@ return n; } -static PurpleBlistNode *purple_blist_get_last_child(PurpleBlistNode *node) +static PurpleBListNode *purple_blist_get_last_child(PurpleBListNode *node) { if (!node) return NULL; @@ -145,7 +145,7 @@ struct _purple_hbuddy { char *name; PurpleAccount *account; - PurpleBlistNode *group; + PurpleBListNode *group; }; /* This function must not use purple_normalize */ @@ -240,7 +240,7 @@ } static xmlnode * -buddy_to_xmlnode(PurpleBlistNode *bnode) +buddy_to_xmlnode(PurpleBListNode *bnode) { xmlnode *node, *child; PurpleBuddy *buddy; @@ -267,11 +267,11 @@ } static xmlnode * -contact_to_xmlnode(PurpleBlistNode *cnode) +contact_to_xmlnode(PurpleBListNode *cnode) { xmlnode *node, *child; PurpleContact *contact; - PurpleBlistNode *bnode; + PurpleBListNode *bnode; contact = (PurpleContact *)cnode; @@ -301,7 +301,7 @@ } static xmlnode * -chat_to_xmlnode(PurpleBlistNode *cnode) +chat_to_xmlnode(PurpleBListNode *cnode) { xmlnode *node, *child; PurpleChat *chat; @@ -328,11 +328,11 @@ } static xmlnode * -group_to_xmlnode(PurpleBlistNode *gnode) +group_to_xmlnode(PurpleBListNode *gnode) { xmlnode *node, *child; PurpleGroup *group; - PurpleBlistNode *cnode; + PurpleBListNode *cnode; group = (PurpleGroup *)gnode; @@ -394,7 +394,7 @@ blist_to_xmlnode(void) { xmlnode *node, *child, *grandchild; - PurpleBlistNode *gnode; + PurpleBListNode *gnode; GList *cur; node = xmlnode_new("purple"); @@ -474,7 +474,7 @@ } static void -purple_blist_save_node(PurpleBlistNode *node) +purple_blist_save_node(PurpleBListNode *node) { _purple_blist_schedule_save(); } @@ -494,7 +494,7 @@ *********************************************************************/ static void -parse_setting(PurpleBlistNode *node, xmlnode *setting) +parse_setting(PurpleBListNode *node, xmlnode *setting) { const char *name = xmlnode_get_attrib(setting, "name"); const char *type = xmlnode_get_attrib(setting, "type"); @@ -544,10 +544,10 @@ buddy = purple_buddy_new(account, name, alias); purple_blist_add_buddy(buddy, contact, group, - purple_blist_get_last_child((PurpleBlistNode*)contact)); + purple_blist_get_last_child((PurpleBListNode*)contact)); for (x = xmlnode_get_child(bnode, "setting"); x; x = xmlnode_get_next_twin(x)) { - parse_setting((PurpleBlistNode*)buddy, x); + parse_setting((PurpleBListNode*)buddy, x); } g_free(name); @@ -562,7 +562,7 @@ const char *alias; purple_blist_add_contact(contact, group, - purple_blist_get_last_child((PurpleBlistNode*)group)); + purple_blist_get_last_child((PurpleBListNode*)group)); if ((alias = xmlnode_get_attrib(cnode, "alias"))) { purple_blist_alias_contact(contact, alias); @@ -574,11 +574,11 @@ if (purple_strequal(x->name, "buddy")) parse_buddy(group, contact, x); else if (purple_strequal(x->name, "setting")) - parse_setting((PurpleBlistNode*)contact, x); + parse_setting((PurpleBListNode*)contact, x); } /* if the contact is empty, don't keep it around. it causes problems */ - if (!((PurpleBlistNode*)contact)->child) + if (!((PurpleBListNode*)contact)->child) purple_blist_remove_contact(contact); } @@ -619,10 +619,10 @@ chat = purple_chat_new(account, alias, components); purple_blist_add_chat(chat, group, - purple_blist_get_last_child((PurpleBlistNode*)group)); + purple_blist_get_last_child((PurpleBListNode*)group)); for (x = xmlnode_get_child(cnode, "setting"); x; x = xmlnode_get_next_twin(x)) { - parse_setting((PurpleBlistNode*)chat, x); + parse_setting((PurpleBListNode*)chat, x); } g_free(alias); @@ -646,7 +646,7 @@ if (cnode->type != XMLNODE_TYPE_TAG) continue; if (purple_strequal(cnode->name, "setting")) - parse_setting((PurpleBlistNode*)group, cnode); + parse_setting((PurpleBListNode*)group, cnode); else if (purple_strequal(cnode->name, "contact") || purple_strequal(cnode->name, "person")) parse_contact(group, cnode); @@ -732,13 +732,13 @@ static void purple_contact_compute_priority_buddy(PurpleContact *contact) { - PurpleBlistNode *bnode; + PurpleBListNode *bnode; PurpleBuddy *new_priority = NULL; g_return_if_fail(contact != NULL); contact->priority = NULL; - for (bnode = ((PurpleBlistNode*)contact)->child; + for (bnode = ((PurpleBListNode*)contact)->child; bnode != NULL; bnode = bnode->next) { @@ -818,7 +818,7 @@ return purplebuddylist; } -PurpleBlistNode * +PurpleBListNode * purple_blist_get_root() { return purplebuddylist ? purplebuddylist->root : NULL; @@ -881,7 +881,7 @@ ops->set_visible(purplebuddylist, show); } -static PurpleBlistNode *get_next_node(PurpleBlistNode *node, gboolean godeep) +static PurpleBListNode *get_next_node(PurpleBListNode *node, gboolean godeep) { if (node == NULL) return NULL; @@ -895,9 +895,9 @@ return get_next_node(node->parent, FALSE); } -PurpleBlistNode *purple_blist_node_next(PurpleBlistNode *node, gboolean offline) +PurpleBListNode *purple_blist_node_next(PurpleBListNode *node, gboolean offline) { - PurpleBlistNode *ret = node; + PurpleBListNode *ret = node; if (offline) return get_next_node(ret, TRUE); @@ -910,28 +910,28 @@ return ret; } -PurpleBlistNode *purple_blist_node_get_parent(PurpleBlistNode *node) +PurpleBListNode *purple_blist_node_get_parent(PurpleBListNode *node) { return node ? node->parent : NULL; } -PurpleBlistNode *purple_blist_node_get_first_child(PurpleBlistNode *node) +PurpleBListNode *purple_blist_node_get_first_child(PurpleBListNode *node) { return node ? node->child : NULL; } -PurpleBlistNode *purple_blist_node_get_sibling_next(PurpleBlistNode *node) +PurpleBListNode *purple_blist_node_get_sibling_next(PurpleBListNode *node) { return node? node->next : NULL; } -PurpleBlistNode *purple_blist_node_get_sibling_prev(PurpleBlistNode *node) +PurpleBListNode *purple_blist_node_get_sibling_prev(PurpleBListNode *node) { return node? node->prev : NULL; } void * -purple_blist_node_get_ui_data(const PurpleBlistNode *node) +purple_blist_node_get_ui_data(const PurpleBListNode *node) { g_return_val_if_fail(node, NULL); @@ -939,7 +939,7 @@ } void -purple_blist_node_set_ui_data(PurpleBlistNode *node, void *ui_data) { +purple_blist_node_set_ui_data(PurpleBListNode *node, void *ui_data) { g_return_if_fail(node); node->ui_data = ui_data; @@ -951,7 +951,7 @@ PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); PurplePresence *presence; PurpleStatus *status; - PurpleBlistNode *cnode; + PurpleBListNode *cnode; g_return_if_fail(buddy != NULL); @@ -996,11 +996,11 @@ */ purple_contact_invalidate_priority_buddy(purple_buddy_get_contact(buddy)); if (ops && ops->update) - ops->update(purplebuddylist, (PurpleBlistNode *)buddy); + ops->update(purplebuddylist, (PurpleBListNode *)buddy); } void -purple_blist_update_node_icon(PurpleBlistNode *node) +purple_blist_update_node_icon(PurpleBListNode *node) { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); @@ -1025,7 +1025,7 @@ hb = g_new(struct _purple_hbuddy, 1); hb->name = (gchar *)purple_normalize(buddy->account, buddy->name); hb->account = buddy->account; - hb->group = ((PurpleBlistNode *)buddy)->parent->parent; + hb->group = ((PurpleBListNode *)buddy)->parent->parent; g_hash_table_remove(purplebuddylist->buddies, hb); account_buddies = g_hash_table_lookup(buddies_cache, buddy->account); @@ -1037,7 +1037,7 @@ hb2 = g_new(struct _purple_hbuddy, 1); hb2->name = g_strdup(hb->name); hb2->account = buddy->account; - hb2->group = ((PurpleBlistNode *)buddy)->parent->parent; + hb2->group = ((PurpleBListNode *)buddy)->parent->parent; g_hash_table_replace(account_buddies, hb2, buddy); @@ -1045,10 +1045,10 @@ buddy->name = g_strdup(name); if (ops && ops->save_node) - ops->save_node((PurpleBlistNode *) buddy); + ops->save_node((PurpleBListNode *) buddy); if (ops && ops->update) - ops->update(purplebuddylist, (PurpleBlistNode *)buddy); + ops->update(purplebuddylist, (PurpleBListNode *)buddy); } static gboolean @@ -1062,7 +1062,7 @@ { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); PurpleIMConversation *im; - PurpleBlistNode *bnode; + PurpleBListNode *bnode; char *old_alias; char *new_alias = NULL; @@ -1086,12 +1086,12 @@ } if (ops && ops->save_node) - ops->save_node((PurpleBlistNode*) contact); + ops->save_node((PurpleBListNode*) contact); if (ops && ops->update) - ops->update(purplebuddylist, (PurpleBlistNode *)contact); - - for(bnode = ((PurpleBlistNode *)contact)->child; bnode != NULL; bnode = bnode->next) + ops->update(purplebuddylist, (PurpleBListNode *)contact); + + for(bnode = ((PurpleBListNode *)contact)->child; bnode != NULL; bnode = bnode->next) { PurpleBuddy *buddy = (PurpleBuddy *)bnode; @@ -1132,10 +1132,10 @@ } if (ops && ops->save_node) - ops->save_node((PurpleBlistNode*) chat); + ops->save_node((PurpleBListNode*) chat); if (ops && ops->update) - ops->update(purplebuddylist, (PurpleBlistNode *)chat); + ops->update(purplebuddylist, (PurpleBListNode *)chat); purple_signal_emit(purple_blist_get_handle(), "blist-node-aliased", chat, old_alias); @@ -1169,10 +1169,10 @@ } if (ops && ops->save_node) - ops->save_node((PurpleBlistNode*) buddy); + ops->save_node((PurpleBListNode*) buddy); if (ops && ops->update) - ops->update(purplebuddylist, (PurpleBlistNode *)buddy); + ops->update(purplebuddylist, (PurpleBListNode *)buddy); im = purple_conversations_find_im_with_account(buddy->name, buddy->account); @@ -1211,10 +1211,10 @@ } if (ops && ops->save_node) - ops->save_node((PurpleBlistNode*) buddy); + ops->save_node((PurpleBListNode*) buddy); if (ops && ops->update) - ops->update(purplebuddylist, (PurpleBlistNode *)buddy); + ops->update(purplebuddylist, (PurpleBListNode *)buddy); im = purple_conversations_find_im_with_account(buddy->name, buddy->account); @@ -1251,10 +1251,10 @@ dest = purple_find_group(new_name); if (dest != NULL && purple_utf8_strcasecmp(source->name, dest->name) != 0) { /* We're merging two groups */ - PurpleBlistNode *prev, *child, *next; - - prev = purple_blist_get_last_child((PurpleBlistNode*)dest); - child = ((PurpleBlistNode*)source)->child; + PurpleBListNode *prev, *child, *next; + + prev = purple_blist_get_last_child((PurpleBListNode*)dest); + child = ((PurpleBListNode*)source)->child; /* * TODO: This seems like a dumb way to do this... why not just @@ -1266,7 +1266,7 @@ { next = child->next; if (PURPLE_IS_CONTACT(child)) { - PurpleBlistNode *bnode; + PurpleBListNode *bnode; purple_blist_add_contact((PurpleContact *)child, dest, prev); for (bnode = child->child; bnode != NULL; bnode = bnode->next) { purple_blist_add_buddy((PurpleBuddy *)bnode, (PurpleContact *)child, @@ -1291,11 +1291,11 @@ g_free(new_name); } else { /* A simple rename */ - PurpleBlistNode *cnode, *bnode; + PurpleBListNode *cnode, *bnode; gchar* key; /* Build a GList of all buddies in this group */ - for (cnode = ((PurpleBlistNode *)source)->child; cnode != NULL; cnode = cnode->next) { + for (cnode = ((PurpleBListNode *)source)->child; cnode != NULL; cnode = cnode->next) { if (PURPLE_IS_CONTACT(cnode)) for (bnode = cnode->child; bnode != NULL; bnode = bnode->next) moved_buddies = g_list_append(moved_buddies, bnode); @@ -1314,11 +1314,11 @@ /* Save our changes */ if (ops && ops->save_node) - ops->save_node((PurpleBlistNode*) source); + ops->save_node((PurpleBListNode*) source); /* Update the UI */ if (ops && ops->update) - ops->update(purplebuddylist, (PurpleBlistNode*)source); + ops->update(purplebuddylist, (PurpleBListNode*)source); /* Notify all PRPLs */ /* TODO: Is this condition needed? Seems like it would always be TRUE */ @@ -1345,7 +1345,7 @@ PurpleBuddy *buddy = (PurpleBuddy *)l->data; if(buddy && buddy->account == account) - buddies = g_list_append(buddies, (PurpleBlistNode *)buddy); + buddies = g_list_append(buddies, (PurpleBListNode *)buddy); } if(prpl_info->rename_group) { @@ -1355,7 +1355,7 @@ /* Make a list of what the groups each buddy is in */ for(cur = buddies; cur; cur = cur->next) { - PurpleBlistNode *node = (PurpleBlistNode *)cur->data; + PurpleBListNode *node = (PurpleBListNode *)cur->data; groups = g_list_prepend(groups, node->parent->parent); } @@ -1371,7 +1371,7 @@ g_free(old_name); } -static void purple_blist_node_initialize_settings(PurpleBlistNode *node); +static void purple_blist_node_initialize_settings(PurpleBListNode *node); PurpleChat *purple_chat_new(PurpleAccount *account, const char *alias, GHashTable *components) { @@ -1386,11 +1386,11 @@ if ((alias != NULL) && (*alias != '\0')) chat->alias = purple_utf8_strip_unprintables(alias); chat->components = components; - purple_blist_node_initialize_settings((PurpleBlistNode *)chat); - ((PurpleBlistNode *)chat)->type = PURPLE_BLIST_CHAT_NODE; + purple_blist_node_initialize_settings((PurpleBListNode *)chat); + ((PurpleBListNode *)chat)->type = PURPLE_BLIST_CHAT_NODE; if (ops != NULL && ops->new_node != NULL) - ops->new_node((PurpleBlistNode *)chat); + ops->new_node((PurpleBListNode *)chat); PURPLE_DBUS_REGISTER_POINTER(chat, PurpleChat); return chat; @@ -1419,14 +1419,14 @@ buddy->name = purple_utf8_strip_unprintables(name); buddy->alias = purple_utf8_strip_unprintables(alias); buddy->presence = purple_presence_new_for_buddy(buddy); - ((PurpleBlistNode *)buddy)->type = PURPLE_BLIST_BUDDY_NODE; + ((PurpleBListNode *)buddy)->type = PURPLE_BLIST_BUDDY_NODE; purple_presence_set_status_active(buddy->presence, "offline", TRUE); - purple_blist_node_initialize_settings((PurpleBlistNode *)buddy); + purple_blist_node_initialize_settings((PurpleBListNode *)buddy); if (ops && ops->new_node) - ops->new_node((PurpleBlistNode *)buddy); + ops->new_node((PurpleBListNode *)buddy); PURPLE_DBUS_REGISTER_POINTER(buddy, PurpleBuddy); return buddy; @@ -1481,7 +1481,7 @@ purple_signal_emit(purple_blist_get_handle(), "buddy-icon-changed", buddy); - purple_blist_update_node_icon((PurpleBlistNode*)buddy); + purple_blist_update_node_icon((PurpleBListNode*)buddy); } PurpleAccount * @@ -1525,13 +1525,13 @@ } -void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBlistNode *node) +void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBListNode *node) { - PurpleBlistNode *cnode = (PurpleBlistNode*)chat; + PurpleBListNode *cnode = (PurpleBListNode*)chat; PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); g_return_if_fail(chat != NULL); - g_return_if_fail(PURPLE_IS_CHAT((PurpleBlistNode *)chat)); + g_return_if_fail(PURPLE_IS_CHAT((PurpleBListNode *)chat)); if (node == NULL) { if (group == NULL) @@ -1587,12 +1587,12 @@ ((PurpleGroup *)node->parent)->currentsize++; } } else { - if (((PurpleBlistNode *)group)->child) - ((PurpleBlistNode *)group)->child->prev = cnode; - cnode->next = ((PurpleBlistNode *)group)->child; + if (((PurpleBListNode *)group)->child) + ((PurpleBListNode *)group)->child->prev = cnode; + cnode->next = ((PurpleBListNode *)group)->child; cnode->prev = NULL; - ((PurpleBlistNode *)group)->child = cnode; - cnode->parent = (PurpleBlistNode *)group; + ((PurpleBListNode *)group)->child = cnode; + cnode->parent = (PurpleBListNode *)group; group->totalsize++; if (purple_account_is_connected(chat->account)) { group->online++; @@ -1604,15 +1604,15 @@ ops->save_node(cnode); if (ops && ops->update) - ops->update(purplebuddylist, (PurpleBlistNode *)cnode); + ops->update(purplebuddylist, (PurpleBListNode *)cnode); purple_signal_emit(purple_blist_get_handle(), "blist-node-added", cnode); } -void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node) +void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBListNode *node) { - PurpleBlistNode *cnode, *bnode; + PurpleBListNode *cnode, *bnode; PurpleGroup *g; PurpleContact *c; PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); @@ -1620,13 +1620,13 @@ GHashTable *account_buddies; g_return_if_fail(buddy != NULL); - g_return_if_fail(PURPLE_IS_BUDDY((PurpleBlistNode*)buddy)); - - bnode = (PurpleBlistNode *)buddy; + g_return_if_fail(PURPLE_IS_BUDDY((PurpleBListNode*)buddy)); + + bnode = (PurpleBListNode *)buddy; /* if we're moving to overtop of ourselves, do nothing */ if (bnode == node || (!node && bnode->parent && - contact && bnode->parent == (PurpleBlistNode*)contact + contact && bnode->parent == (PurpleBListNode*)contact && bnode == bnode->parent->child)) return; @@ -1647,10 +1647,10 @@ } c = purple_contact_new(); purple_blist_add_contact(c, g, - purple_blist_get_last_child((PurpleBlistNode*)g)); + purple_blist_get_last_child((PurpleBListNode*)g)); } - cnode = (PurpleBlistNode *)c; + cnode = (PurpleBListNode *)c; if (bnode->parent) { if (PURPLE_IS_BUDDY_ONLINE(buddy)) { @@ -1666,7 +1666,7 @@ ((PurpleContact*)bnode->parent)->totalsize--; /* the group totalsize will be taken care of by remove_contact below */ - if (bnode->parent->parent != (PurpleBlistNode*)g) + if (bnode->parent->parent != (PurpleBListNode*)g) serv_move_buddy(buddy, (PurpleGroup *)bnode->parent->parent, g); if (bnode->next) @@ -1679,7 +1679,7 @@ if (ops && ops->remove) ops->remove(purplebuddylist, bnode); - if (bnode->parent->parent != (PurpleBlistNode*)g) { + if (bnode->parent->parent != (PurpleBListNode*)g) { struct _purple_hbuddy hb; hb.name = (gchar *)purple_normalize(buddy->account, buddy->name); hb.account = buddy->account; @@ -1728,7 +1728,7 @@ hb = g_new(struct _purple_hbuddy, 1); hb->name = g_strdup(purple_normalize(buddy->account, buddy->name)); hb->account = buddy->account; - hb->group = ((PurpleBlistNode*)buddy)->parent->parent; + hb->group = ((PurpleBListNode*)buddy)->parent->parent; g_hash_table_replace(purplebuddylist->buddies, hb, buddy); @@ -1737,17 +1737,17 @@ hb2 = g_new(struct _purple_hbuddy, 1); hb2->name = g_strdup(hb->name); hb2->account = buddy->account; - hb2->group = ((PurpleBlistNode*)buddy)->parent->parent; + hb2->group = ((PurpleBListNode*)buddy)->parent->parent; g_hash_table_replace(account_buddies, hb2, buddy); purple_contact_invalidate_priority_buddy(purple_buddy_get_contact(buddy)); if (ops && ops->save_node) - ops->save_node((PurpleBlistNode*) buddy); + ops->save_node((PurpleBListNode*) buddy); if (ops && ops->update) - ops->update(purplebuddylist, (PurpleBlistNode*)buddy); + ops->update(purplebuddylist, (PurpleBListNode*)buddy); /* Signal that the buddy has been added */ purple_signal_emit(purple_blist_get_handle(), "buddy-added", buddy); @@ -1764,11 +1764,11 @@ contact->totalsize = 0; contact->currentsize = 0; contact->online = 0; - purple_blist_node_initialize_settings((PurpleBlistNode *)contact); - ((PurpleBlistNode *)contact)->type = PURPLE_BLIST_CONTACT_NODE; + purple_blist_node_initialize_settings((PurpleBListNode *)contact); + ((PurpleBListNode *)contact)->type = PURPLE_BLIST_CONTACT_NODE; if (ops && ops->new_node) - ops->new_node((PurpleBlistNode *)contact); + ops->new_node((PurpleBListNode *)contact); PURPLE_DBUS_REGISTER_POINTER(contact, PurpleContact); return contact; @@ -1788,7 +1788,7 @@ { g_return_val_if_fail(contact, NULL); - return (PurpleGroup *)(((PurpleBlistNode *)contact)->parent); + return (PurpleGroup *)(((PurpleBListNode *)contact)->parent); } const char *purple_contact_get_alias(PurpleContact* contact) @@ -1803,7 +1803,7 @@ gboolean purple_contact_on_account(PurpleContact *c, PurpleAccount *account) { - PurpleBlistNode *bnode, *cnode = (PurpleBlistNode *) c; + PurpleBListNode *bnode, *cnode = (PurpleBListNode *) c; g_return_val_if_fail(c != NULL, FALSE); g_return_val_if_fail(account != NULL, FALSE); @@ -1852,11 +1852,11 @@ group->totalsize = 0; group->currentsize = 0; group->online = 0; - purple_blist_node_initialize_settings((PurpleBlistNode *)group); - ((PurpleBlistNode *)group)->type = PURPLE_BLIST_GROUP_NODE; + purple_blist_node_initialize_settings((PurpleBListNode *)group); + ((PurpleBListNode *)group)->type = PURPLE_BLIST_GROUP_NODE; if (ops && ops->new_node) - ops->new_node((PurpleBlistNode *)group); + ops->new_node((PurpleBListNode *)group); PURPLE_DBUS_REGISTER_POINTER(group, PurpleGroup); return group; @@ -1871,14 +1871,14 @@ g_free(group); } -void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node) +void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, PurpleBListNode *node) { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); PurpleGroup *g; - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; g_return_if_fail(contact != NULL); - g_return_if_fail(PURPLE_IS_CONTACT((PurpleBlistNode*)contact)); + g_return_if_fail(PURPLE_IS_CONTACT((PurpleBListNode*)contact)); if (PURPLE_BLIST_NODE(contact) == node) return; @@ -1897,8 +1897,8 @@ } } - gnode = (PurpleBlistNode*)g; - cnode = (PurpleBlistNode*)contact; + gnode = (PurpleBListNode*)g; + cnode = (PurpleBListNode*)contact; if (cnode->parent) { if (cnode->parent->child == cnode) @@ -1911,7 +1911,7 @@ if (cnode->parent != gnode) { bnode = cnode->child; while (bnode) { - PurpleBlistNode *next_bnode = bnode->next; + PurpleBListNode *next_bnode = bnode->next; PurpleBuddy *b = (PurpleBuddy*)bnode; GHashTable *account_buddies; @@ -2018,10 +2018,10 @@ } } -void purple_blist_merge_contact(PurpleContact *source, PurpleBlistNode *node) +void purple_blist_merge_contact(PurpleContact *source, PurpleBListNode *node) { - PurpleBlistNode *sourcenode = (PurpleBlistNode*)source; - PurpleBlistNode *prev, *cur, *next; + PurpleBListNode *sourcenode = (PurpleBListNode*)source; + PurpleBListNode *prev, *cur, *next; PurpleContact *target; g_return_if_fail(source != NULL); @@ -2052,14 +2052,14 @@ } } -void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node) +void purple_blist_add_group(PurpleGroup *group, PurpleBListNode *node) { PurpleBlistUiOps *ops; - PurpleBlistNode *gnode = (PurpleBlistNode*)group; + PurpleBListNode *gnode = (PurpleBListNode*)group; gchar* key; g_return_if_fail(group != NULL); - g_return_if_fail(PURPLE_IS_GROUP((PurpleBlistNode *)group)); + g_return_if_fail(PURPLE_IS_GROUP((PurpleBListNode *)group)); ops = purple_blist_get_ui_ops(); @@ -2075,7 +2075,7 @@ /* This is just being moved */ if (ops && ops->remove) - ops->remove(purplebuddylist, (PurpleBlistNode *)group); + ops->remove(purplebuddylist, (PurpleBListNode *)group); if (gnode == purplebuddylist->root) purplebuddylist->root = gnode->next; @@ -2121,12 +2121,12 @@ void purple_blist_remove_contact(PurpleContact *contact) { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); - PurpleBlistNode *node, *gnode; + PurpleBListNode *node, *gnode; PurpleGroup *group; g_return_if_fail(contact != NULL); - node = (PurpleBlistNode *)contact; + node = (PurpleBListNode *)contact; gnode = node->parent; group = PURPLE_GROUP(gnode); @@ -2173,7 +2173,7 @@ void purple_blist_remove_buddy(PurpleBuddy *buddy) { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); - PurpleBlistNode *node, *cnode, *gnode; + PurpleBListNode *node, *cnode, *gnode; PurpleContact *contact; PurpleGroup *group; struct _purple_hbuddy hb; @@ -2181,7 +2181,7 @@ g_return_if_fail(buddy != NULL); - node = (PurpleBlistNode *)buddy; + node = (PurpleBListNode *)buddy; cnode = node->parent; gnode = (cnode != NULL) ? cnode->parent : NULL; contact = (PurpleContact *)cnode; @@ -2252,12 +2252,12 @@ void purple_blist_remove_chat(PurpleChat *chat) { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); - PurpleBlistNode *node, *gnode; + PurpleBListNode *node, *gnode; PurpleGroup *group; g_return_if_fail(chat != NULL); - node = (PurpleBlistNode *)chat; + node = (PurpleBListNode *)chat; gnode = node->parent; group = (PurpleGroup *)gnode; @@ -2297,13 +2297,13 @@ void purple_blist_remove_group(PurpleGroup *group) { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); - PurpleBlistNode *node; + PurpleBListNode *node; GList *l; gchar* key; g_return_if_fail(group != NULL); - node = (PurpleBlistNode *)group; + node = (PurpleBListNode *)group; /* Make sure the group is empty */ if (node->child) @@ -2458,7 +2458,7 @@ { PurpleBuddy *buddy; struct _purple_hbuddy hb; - PurpleBlistNode *group; + PurpleBListNode *group; g_return_val_if_fail(purplebuddylist != NULL, NULL); g_return_val_if_fail(account != NULL, NULL); @@ -2491,7 +2491,7 @@ hb.name = (gchar *)purple_normalize(account, name); hb.account = account; - hb.group = (PurpleBlistNode*)group; + hb.group = (PurpleBListNode*)group; return g_hash_table_lookup(purplebuddylist->buddies, &hb); } @@ -2507,7 +2507,7 @@ GSList *purple_find_buddies(PurpleAccount *account, const char *name) { PurpleBuddy *buddy; - PurpleBlistNode *node; + PurpleBListNode *node; GSList *ret = NULL; g_return_val_if_fail(purplebuddylist != NULL, NULL); @@ -2560,7 +2560,7 @@ PurplePlugin *prpl; PurplePluginProtocolInfo *prpl_info = NULL; struct proto_chat_entry *pce; - PurpleBlistNode *node, *group; + PurpleBListNode *node, *group; GList *parts; char *normname; @@ -2613,7 +2613,7 @@ { g_return_val_if_fail(chat != NULL, NULL); - return (PurpleGroup *)(((PurpleBlistNode *)chat)->parent); + return (PurpleGroup *)(((PurpleBListNode *)chat)->parent); } PurpleAccount * @@ -2661,18 +2661,18 @@ { g_return_val_if_fail(buddy != NULL, NULL); - if (((PurpleBlistNode *)buddy)->parent == NULL) + if (((PurpleBListNode *)buddy)->parent == NULL) return NULL; - return (PurpleGroup *)(((PurpleBlistNode*)buddy)->parent->parent); + return (PurpleGroup *)(((PurpleBListNode*)buddy)->parent->parent); } GSList *purple_group_get_accounts(PurpleGroup *group) { GSList *l = NULL; - PurpleBlistNode *gnode, *cnode, *bnode; - - gnode = (PurpleBlistNode *)group; + PurpleBListNode *gnode, *cnode, *bnode; + + gnode = (PurpleBListNode *)group; for (cnode = gnode->child; cnode; cnode = cnode->next) { if (PURPLE_IS_CHAT(cnode)) { @@ -2694,7 +2694,7 @@ void purple_blist_add_account(PurpleAccount *account) { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; g_return_if_fail(purplebuddylist != NULL); @@ -2736,7 +2736,7 @@ void purple_blist_remove_account(PurpleAccount *account) { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; PurpleBuddy *buddy; PurpleChat *chat; PurpleContact *contact; @@ -2820,8 +2820,8 @@ gboolean purple_group_on_account(PurpleGroup *g, PurpleAccount *account) { - PurpleBlistNode *cnode; - for (cnode = ((PurpleBlistNode *)g)->child; cnode; cnode = cnode->next) { + PurpleBListNode *cnode; + for (cnode = ((PurpleBListNode *)g)->child; cnode; cnode = cnode->next) { if (PURPLE_IS_CONTACT(cnode)) { if(purple_contact_on_account((PurpleContact *) cnode, account)) return TRUE; @@ -2878,10 +2878,10 @@ } static void -purple_blist_node_destroy(PurpleBlistNode *node) +purple_blist_node_destroy(PurpleBListNode *node) { PurpleBlistUiOps *ui_ops; - PurpleBlistNode *child, *next_child; + PurpleBListNode *child, *next_child; ui_ops = purple_blist_get_ui_ops(); child = node->child; @@ -2919,7 +2919,7 @@ purple_value_destroy(value); } -static void purple_blist_node_initialize_settings(PurpleBlistNode *node) +static void purple_blist_node_initialize_settings(PurpleBListNode *node) { if (node->settings) return; @@ -2928,7 +2928,7 @@ (GDestroyNotify)purple_blist_node_setting_free); } -void purple_blist_node_remove_setting(PurpleBlistNode *node, const char *key) +void purple_blist_node_remove_setting(PurpleBListNode *node, const char *key) { PurpleBlistUiOps *ops; g_return_if_fail(node != NULL); @@ -2943,30 +2943,30 @@ } void -purple_blist_node_set_flags(PurpleBlistNode *node, PurpleBlistNodeFlags flags) +purple_blist_node_set_flags(PurpleBListNode *node, PurpleBListNodeFlags flags) { g_return_if_fail(node != NULL); node->flags = flags; } -PurpleBlistNodeFlags -purple_blist_node_get_flags(PurpleBlistNode *node) +PurpleBListNodeFlags +purple_blist_node_get_flags(PurpleBListNode *node) { g_return_val_if_fail(node != NULL, 0); return node->flags; } -PurpleBlistNodeType -purple_blist_node_get_type(PurpleBlistNode *node) +PurpleBListNodeType +purple_blist_node_get_type(PurpleBListNode *node) { g_return_val_if_fail(node != NULL, PURPLE_BLIST_OTHER_NODE); return node->type; } gboolean -purple_blist_node_has_setting(PurpleBlistNode* node, const char *key) +purple_blist_node_has_setting(PurpleBListNode* node, const char *key) { g_return_val_if_fail(node != NULL, FALSE); g_return_val_if_fail(node->settings != NULL, FALSE); @@ -2977,7 +2977,7 @@ } void -purple_blist_node_set_bool(PurpleBlistNode* node, const char *key, gboolean data) +purple_blist_node_set_bool(PurpleBListNode* node, const char *key, gboolean data) { PurpleValue *value; PurpleBlistUiOps *ops; @@ -2997,7 +2997,7 @@ } gboolean -purple_blist_node_get_bool(PurpleBlistNode* node, const char *key) +purple_blist_node_get_bool(PurpleBListNode* node, const char *key) { PurpleValue *value; @@ -3016,7 +3016,7 @@ } void -purple_blist_node_set_int(PurpleBlistNode* node, const char *key, int data) +purple_blist_node_set_int(PurpleBListNode* node, const char *key, int data) { PurpleValue *value; PurpleBlistUiOps *ops; @@ -3036,7 +3036,7 @@ } int -purple_blist_node_get_int(PurpleBlistNode* node, const char *key) +purple_blist_node_get_int(PurpleBListNode* node, const char *key) { PurpleValue *value; @@ -3055,7 +3055,7 @@ } void -purple_blist_node_set_string(PurpleBlistNode* node, const char *key, const char *data) +purple_blist_node_set_string(PurpleBListNode* node, const char *key, const char *data) { PurpleValue *value; PurpleBlistUiOps *ops; @@ -3075,7 +3075,7 @@ } const char * -purple_blist_node_get_string(PurpleBlistNode* node, const char *key) +purple_blist_node_get_string(PurpleBListNode* node, const char *key) { PurpleValue *value; @@ -3094,7 +3094,7 @@ } GList * -purple_blist_node_get_extended_menu(PurpleBlistNode *n) +purple_blist_node_get_extended_menu(PurpleBListNode *n) { GList *menu = NULL; @@ -3271,7 +3271,7 @@ void purple_blist_uninit(void) { - PurpleBlistNode *node, *next_node; + PurpleBListNode *node, *next_node; /* This happens if we quit before purple_set_blist is called. */ if (purplebuddylist == NULL)
--- a/libpurple/blist.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/blist.h Wed Jul 03 22:18:55 2013 +0530 @@ -32,16 +32,16 @@ #include <glib.h> #define PURPLE_TYPE_BLIST_NODE (purple_blist_node_get_type()) -#define PURPLE_BLIST_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_BLIST_NODE, PurpleBlistNode)) -#define PURPLE_BLIST_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_BLIST_NODE, PurpleBlistNodeClass)) +#define PURPLE_BLIST_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_BLIST_NODE, PurpleBListNode)) +#define PURPLE_BLIST_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_BLIST_NODE, PurpleBListNodeClass)) #define PURPLE_IS_BLIST_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_BLIST_NODE)) #define PURPLE_IS_BLIST_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_BLIST_NODE)) -#define PURPLE_BLIST_NODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_BLIST_NODE, PurpleBlistNodeClass)) +#define PURPLE_BLIST_NODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_BLIST_NODE, PurpleBListNodeClass)) -/** @copydoc _PurpleBlistNode */ -typedef struct _PurpleBlistNode PurpleBlistNode; -/** @copydoc _PurpleBlistNodeClass */ -typedef struct _PurpleBlistNodeClass PurpleBlistNodeClass; +/** @copydoc _PurpleBListNode */ +typedef struct _PurpleBListNode PurpleBListNode; +/** @copydoc _PurpleBListNodeClass */ +typedef struct _PurpleBListNodeClass PurpleBListNodeClass; #define PURPLE_TYPE_BUDDY (purple_buddy_get_type()) #define PURPLE_BUDDY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_BUDDY, PurpleBuddy)) @@ -130,7 +130,7 @@ * A Buddy list node. This can represent a group, a buddy, or anything else. * This is a base class for PurpleBuddy, PurpleContact, PurpleGroup, and for * anything else that wants to put itself in the buddy list. */ -struct _PurpleBlistNode { +struct _PurpleBListNode { /*< private >*/ GObject gparent; @@ -139,14 +139,14 @@ */ gpointer ui_data; - PurpleBlistNode *prev; /**< The sibling before this buddy. */ - PurpleBlistNode *next; /**< The sibling after this buddy. */ - PurpleBlistNode *parent; /**< The parent of this node */ - PurpleBlistNode *child; /**< The child of this node */ + PurpleBListNode *prev; /**< The sibling before this buddy. */ + PurpleBListNode *next; /**< The sibling after this buddy. */ + PurpleBListNode *parent; /**< The parent of this node */ + PurpleBListNode *child; /**< The child of this node */ }; -/** The base class for all #PurpleBlistNode's. */ -struct _PurpleBlistNodeClass { +/** The base class for all #PurpleBListNode's. */ +struct _PurpleBListNodeClass { /*< private >*/ GObjectClass gparent_class; @@ -162,13 +162,13 @@ */ struct _PurpleBuddy { /** The node that this buddy inherits from */ - PurpleBlistNode node; + PurpleBListNode node; }; /** The base class for all #PurpleBuddy's. */ struct _PurpleBuddyClass { /*< private >*/ - PurpleBlistNodeClass node_class; + PurpleBListNodeClass node_class; void (*_purple_reserved1)(void); void (*_purple_reserved2)(void); @@ -182,13 +182,13 @@ */ struct _PurpleContact { /** The node that this contact inherits from */ - PurpleBlistNode node; + PurpleBListNode node; }; /** The base class for all #PurpleContact's. */ struct _PurpleContactClass { /*< private >*/ - PurpleBlistNodeClass node_class; + PurpleBListNodeClass node_class; void (*_purple_reserved1)(void); void (*_purple_reserved2)(void); @@ -202,13 +202,13 @@ */ struct _PurpleGroup { /** The node that this group inherits from */ - PurpleBlistNode node; + PurpleBListNode node; }; /** The base class for all #PurpleGroup's. */ struct _PurpleGroupClass { /*< private >*/ - PurpleBlistNodeClass node_class; + PurpleBListNodeClass node_class; void (*_purple_reserved1)(void); void (*_purple_reserved2)(void); @@ -222,13 +222,13 @@ */ struct _PurpleChat { /** The node that this chat inherits from */ - PurpleBlistNode node; + PurpleBListNode node; }; /** The base class for all #PurpleChat's. */ struct _PurpleChatClass { /*< private >*/ - PurpleBlistNodeClass node_class; + PurpleBListNodeClass node_class; void (*_purple_reserved1)(void); void (*_purple_reserved2)(void); @@ -271,12 +271,12 @@ struct _PurpleBlistUiOps { void (*new_list)(PurpleBuddyList *list); /**< Sets UI-specific data on a buddy list. */ - void (*new_node)(PurpleBlistNode *node); /**< Sets UI-specific data on a node. */ + void (*new_node)(PurpleBListNode *node); /**< Sets UI-specific data on a node. */ void (*show)(PurpleBuddyList *list); /**< The core will call this when it's finished doing its core stuff */ void (*update)(PurpleBuddyList *list, - PurpleBlistNode *node); /**< This will update a node in the buddy list. */ + PurpleBListNode *node); /**< This will update a node in the buddy list. */ void (*remove)(PurpleBuddyList *list, - PurpleBlistNode *node); /**< This removes a node from the list */ + PurpleBListNode *node); /**< This removes a node from the list */ void (*destroy)(PurpleBuddyList *list); /**< When the list is destroyed, this is called to destroy the UI. */ void (*set_visible)(PurpleBuddyList *list, gboolean show); /**< Hides or unhides the buddy list */ @@ -295,7 +295,7 @@ * * @param node The node which has been modified. */ - void (*save_node)(PurpleBlistNode *node); + void (*save_node)(PurpleBListNode *node); /** * Called when a node is about to be removed from the buddy list. @@ -308,7 +308,7 @@ * * @param node The node which has been modified. */ - void (*remove_node)(PurpleBlistNode *node); + void (*remove_node)(PurpleBListNode *node); /** * Called to save all the data for an account. If the UI sets this, @@ -354,7 +354,7 @@ * * @return The root node. */ -PurpleBlistNode *purple_blist_get_root(void); +PurpleBListNode *purple_blist_get_root(void); /** * Returns a list of every buddy in the list. Use of this function is @@ -394,7 +394,7 @@ * @see purple_blist_node_get_sibling_next * @see purple_blist_node_get_sibling_prev */ -PurpleBlistNode *purple_blist_node_next(PurpleBlistNode *node, gboolean offline); +PurpleBListNode *purple_blist_node_next(PurpleBListNode *node, gboolean offline); /** * Returns the parent node of a given node. @@ -407,7 +407,7 @@ * @see purple_blist_node_get_sibling_prev * @see purple_blist_node_next */ -PurpleBlistNode *purple_blist_node_get_parent(PurpleBlistNode *node); +PurpleBListNode *purple_blist_node_get_parent(PurpleBListNode *node); /** * Returns the the first child node of a given node. @@ -420,7 +420,7 @@ * @see purple_blist_node_get_sibling_prev * @see purple_blist_node_next */ -PurpleBlistNode *purple_blist_node_get_first_child(PurpleBlistNode *node); +PurpleBListNode *purple_blist_node_get_first_child(PurpleBListNode *node); /** * Returns the sibling node of a given node. @@ -433,7 +433,7 @@ * @see purple_blist_node_get_sibling_prev * @see purple_blist_node_next */ -PurpleBlistNode *purple_blist_node_get_sibling_next(PurpleBlistNode *node); +PurpleBListNode *purple_blist_node_get_sibling_next(PurpleBListNode *node); /** * Returns the previous sibling node of a given node. @@ -446,7 +446,7 @@ * @see purple_blist_node_get_sibling_next * @see purple_blist_node_next */ -PurpleBlistNode *purple_blist_node_get_sibling_prev(PurpleBlistNode *node); +PurpleBListNode *purple_blist_node_get_sibling_prev(PurpleBListNode *node); /** * Returns the UI data of a given node. @@ -454,7 +454,7 @@ * @param node The node. * @return The UI data. */ -gpointer purple_blist_node_get_ui_data(const PurpleBlistNode *node); +gpointer purple_blist_node_get_ui_data(const PurpleBListNode *node); /** * Sets the UI data of a given node. @@ -462,7 +462,7 @@ * @param node The node. * @param ui_data The UI data. */ -void purple_blist_node_set_ui_data(PurpleBlistNode *node, gpointer ui_data); +void purple_blist_node_set_ui_data(PurpleBListNode *node, gpointer ui_data); /** * Shows the buddy list, creating a new one if necessary. @@ -499,9 +499,9 @@ /** * Updates a node's custom icon. * - * @param node The PurpleBlistNode whose custom icon has changed. + * @param node The PurpleBListNode whose custom icon has changed. */ -void purple_blist_update_node_icon(PurpleBlistNode *node); +void purple_blist_update_node_icon(PurpleBListNode *node); /** * Renames a buddy in the buddy list. @@ -582,7 +582,7 @@ * @param group The group to add the new chat to. * @param node The insertion point */ -void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBlistNode *node); +void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, PurpleBListNode *node); /** * Creates a new buddy. @@ -719,7 +719,7 @@ * @param node The insertion point. Pass in NULL to add the node as * the first child in the given group. */ -void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node); +void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBListNode *node); /** * Creates a new group @@ -748,7 +748,7 @@ * @param group The group * @param node The insertion point */ -void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node); +void purple_blist_add_group(PurpleGroup *group, PurpleBListNode *node); /** * Creates a new contact @@ -782,7 +782,7 @@ * @param group The group to add the contact to * @param node The insertion point */ -void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node); +void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, PurpleBListNode *node); /** * Merges two contacts @@ -792,7 +792,7 @@ * @param source The contact to merge * @param node The place to merge to (a buddy or contact) */ -void purple_blist_merge_contact(PurpleContact *source, PurpleBlistNode *node); +void purple_blist_merge_contact(PurpleContact *source, PurpleBListNode *node); /** * Returns the highest priority buddy for a given contact. @@ -1132,7 +1132,7 @@ * * @return TRUE if a value exists, or FALSE if there is no setting */ -gboolean purple_blist_node_has_setting(PurpleBlistNode *node, const char *key); +gboolean purple_blist_node_has_setting(PurpleBListNode *node, const char *key); /** * Associates a boolean with a node in the buddy list @@ -1141,7 +1141,7 @@ * @param key The identifier for the data * @param value The value to set */ -void purple_blist_node_set_bool(PurpleBlistNode *node, const char *key, gboolean value); +void purple_blist_node_set_bool(PurpleBListNode *node, const char *key, gboolean value); /** * Retrieves a named boolean setting from a node in the buddy list @@ -1151,7 +1151,7 @@ * * @return The value, or FALSE if there is no setting */ -gboolean purple_blist_node_get_bool(PurpleBlistNode *node, const char *key); +gboolean purple_blist_node_get_bool(PurpleBListNode *node, const char *key); /** * Associates an integer with a node in the buddy list @@ -1160,7 +1160,7 @@ * @param key The identifier for the data * @param value The value to set */ -void purple_blist_node_set_int(PurpleBlistNode *node, const char *key, int value); +void purple_blist_node_set_int(PurpleBListNode *node, const char *key, int value); /** * Retrieves a named integer setting from a node in the buddy list @@ -1170,7 +1170,7 @@ * * @return The value, or 0 if there is no setting */ -int purple_blist_node_get_int(PurpleBlistNode *node, const char *key); +int purple_blist_node_get_int(PurpleBListNode *node, const char *key); /** * Associates a string with a node in the buddy list @@ -1179,7 +1179,7 @@ * @param key The identifier for the data * @param value The value to set */ -void purple_blist_node_set_string(PurpleBlistNode *node, const char *key, +void purple_blist_node_set_string(PurpleBListNode *node, const char *key, const char *value); /** @@ -1190,7 +1190,7 @@ * * @return The value, or NULL if there is no setting */ -const char *purple_blist_node_get_string(PurpleBlistNode *node, const char *key); +const char *purple_blist_node_get_string(PurpleBListNode *node, const char *key); /** * Removes a named setting from a blist node @@ -1198,7 +1198,7 @@ * @param node The node from which to remove the setting * @param key The name of the setting */ -void purple_blist_node_remove_setting(PurpleBlistNode *node, const char *key); +void purple_blist_node_remove_setting(PurpleBListNode *node, const char *key); /** * Sets whether the node should be saved with the buddy list or not @@ -1207,7 +1207,7 @@ * @param dont_save TRUE if the node should NOT be saved, FALSE if node should * be saved */ -void purple_blist_node_set_dont_save(PurpleBlistNode *node, gboolean dont_save); +void purple_blist_node_set_dont_save(PurpleBListNode *node, gboolean dont_save); /** * Gets whether the node should be saved with the buddy list or not @@ -1216,7 +1216,7 @@ * * @return TRUE if the node should NOT be saved, FALSE if node should be saved */ -gboolean purple_blist_node_get_dont_save(PurpleBlistNode *node); +gboolean purple_blist_node_get_dont_save(PurpleBListNode *node); /*@}*/ @@ -1226,7 +1226,7 @@ * @return A list of PurpleMenuAction items, as harvested by the * blist-node-extended-menu signal. */ -GList *purple_blist_node_get_extended_menu(PurpleBlistNode *n); +GList *purple_blist_node_get_extended_menu(PurpleBListNode *n); /**************************************************************************/ /** @name UI Registration Functions */
--- a/libpurple/buddyicon.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/buddyicon.c Wed Jul 03 22:18:55 2013 +0530 @@ -95,7 +95,7 @@ static GHashTable *icon_file_cache = NULL; /** - * This hash table is used for both custom buddy icons on PurpleBlistNodes and + * This hash table is used for both custom buddy icons on PurpleBListNodes and * account icons. */ static GHashTable *pointer_icon_cache = NULL; @@ -105,7 +105,7 @@ /** "Should icons be cached to disk?" */ static gboolean icon_caching = TRUE; -static void delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name); +static void delete_buddy_icon_settings(PurpleBListNode *node, const char *setting_name); /* * Begin functions for dealing with the on-disk icon cache @@ -399,32 +399,32 @@ char *old_icon; purple_buddy_set_icon(buddy, icon_to_set); - old_icon = g_strdup(purple_blist_node_get_string((PurpleBlistNode *)buddy, + old_icon = g_strdup(purple_blist_node_get_string((PurpleBListNode *)buddy, "buddy_icon")); if (icon->img && purple_buddy_icons_is_caching()) { const char *filename = purple_imgstore_get_filename(icon->img); - purple_blist_node_set_string((PurpleBlistNode *)buddy, + purple_blist_node_set_string((PurpleBListNode *)buddy, "buddy_icon", filename); if (icon->checksum && *icon->checksum) { - purple_blist_node_set_string((PurpleBlistNode *)buddy, + purple_blist_node_set_string((PurpleBListNode *)buddy, "icon_checksum", icon->checksum); } else { - purple_blist_node_remove_setting((PurpleBlistNode *)buddy, + purple_blist_node_remove_setting((PurpleBListNode *)buddy, "icon_checksum"); } ref_filename(filename); } else if (!icon->img) { - purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon"); - purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum"); + purple_blist_node_remove_setting((PurpleBListNode *)buddy, "buddy_icon"); + purple_blist_node_remove_setting((PurpleBListNode *)buddy, "icon_checksum"); } unref_filename(old_icon); g_free(old_icon); @@ -559,9 +559,9 @@ { PurpleBuddy *buddy = (PurpleBuddy *)buddies->data; - unref_filename(purple_blist_node_get_string((PurpleBlistNode *)buddy, "buddy_icon")); - purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon"); - purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum"); + unref_filename(purple_blist_node_get_string((PurpleBListNode *)buddy, "buddy_icon")); + purple_blist_node_remove_setting((PurpleBListNode *)buddy, "buddy_icon"); + purple_blist_node_remove_setting((PurpleBListNode *)buddy, "icon_checksum"); buddies = g_slist_delete_link(buddies, buddies); } @@ -590,7 +590,7 @@ const char * purple_buddy_icons_get_checksum_for_user(PurpleBuddy *buddy) { - return purple_blist_node_get_string((PurpleBlistNode*)buddy, + return purple_blist_node_get_string((PurpleBListNode*)buddy, "icon_checksum"); } @@ -635,7 +635,7 @@ if (!b) return NULL; - protocol_icon_file = purple_blist_node_get_string((PurpleBlistNode*)b, "buddy_icon"); + protocol_icon_file = purple_blist_node_get_string((PurpleBListNode*)b, "buddy_icon"); if (protocol_icon_file == NULL) return NULL; @@ -657,11 +657,11 @@ icon = purple_buddy_icon_create(account, username); icon->img = NULL; - checksum = purple_blist_node_get_string((PurpleBlistNode*)b, "icon_checksum"); + checksum = purple_blist_node_get_string((PurpleBListNode*)b, "icon_checksum"); purple_buddy_icon_set_data(icon, data, len, checksum); } else - delete_buddy_icon_settings((PurpleBlistNode*)b, "buddy_icon"); + delete_buddy_icon_settings((PurpleBListNode*)b, "buddy_icon"); g_free(path); } @@ -788,7 +788,7 @@ } gboolean -purple_buddy_icons_node_has_custom_icon(PurpleBlistNode *node) +purple_buddy_icons_node_has_custom_icon(PurpleBListNode *node) { g_return_val_if_fail(node != NULL, FALSE); @@ -796,7 +796,7 @@ } PurpleStoredImage * -purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node) +purple_buddy_icons_node_find_custom_icon(PurpleBListNode *node) { char *path; size_t len; @@ -832,7 +832,7 @@ } PurpleStoredImage * -purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node, +purple_buddy_icons_node_set_custom_icon(PurpleBListNode *node, guchar *icon_data, size_t icon_len) { char *old_icon; @@ -871,7 +871,7 @@ g_hash_table_remove(pointer_icon_cache, node); if (PURPLE_IS_CONTACT(node)) { - PurpleBlistNode *child; + PurpleBListNode *child; for (child = purple_blist_node_get_first_child(node); child; child = purple_blist_node_get_sibling_next(child)) @@ -891,7 +891,7 @@ /* Is this call necessary anymore? Can the buddies * themselves need updating when the custom buddy * icon changes? */ - purple_blist_update_node_icon((PurpleBlistNode*)buddy); + purple_blist_update_node_icon((PurpleBListNode*)buddy); } } else if (PURPLE_IS_CHAT(node)) { PurpleChatConversation *chat = NULL; @@ -918,7 +918,7 @@ } PurpleStoredImage * -purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node, +purple_buddy_icons_node_set_custom_icon_from_file(PurpleBListNode *node, const gchar *filename) { size_t len = 0; @@ -942,7 +942,7 @@ } static void -delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name) +delete_buddy_icon_settings(PurpleBListNode *node, const char *setting_name) { purple_blist_node_remove_setting(node, setting_name); @@ -981,7 +981,7 @@ void _purple_buddy_icons_blist_loaded_cb() { - PurpleBlistNode *node = purple_blist_get_root(); + PurpleBListNode *node = purple_blist_get_root(); const char *dirname = purple_buddy_icons_get_cache_dir(); while (node != NULL)
--- a/libpurple/buddyicon.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/buddyicon.h Wed Jul 03 22:18:55 2013 +0530 @@ -272,7 +272,7 @@ * @return A boolean indicating if @a node has a custom buddy icon. */ gboolean -purple_buddy_icons_node_has_custom_icon(PurpleBlistNode *node); +purple_buddy_icons_node_has_custom_icon(PurpleBListNode *node); /** * Returns the custom buddy icon image for a blist node. @@ -289,7 +289,7 @@ * @return The custom buddy icon. */ PurpleStoredImage * -purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node); +purple_buddy_icons_node_find_custom_icon(PurpleBListNode *node); /** * Sets a custom buddy icon for a blist node. @@ -306,7 +306,7 @@ * and must call purple_imgstore_ref() if it wants one. */ PurpleStoredImage * -purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node, +purple_buddy_icons_node_set_custom_icon(PurpleBListNode *node, guchar *icon_data, size_t icon_len); /** @@ -323,7 +323,7 @@ * and must call purple_imgstore_ref() if it wants one. */ PurpleStoredImage * -purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node, +purple_buddy_icons_node_set_custom_icon_from_file(PurpleBListNode *node, const gchar *filename); /**
--- a/libpurple/dbus-define-api.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/dbus-define-api.h Wed Jul 03 22:18:55 2013 +0530 @@ -6,13 +6,13 @@ program, which makes these macros callable by DBUS. */ /* blist.h */ -gboolean PURPLE_IS_CHAT(PurpleBlistNode *node); -gboolean PURPLE_IS_BUDDY(PurpleBlistNode *node); -gboolean PURPLE_IS_CONTACT(PurpleBlistNode *node); -gboolean PURPLE_IS_GROUP(PurpleBlistNode *node); +gboolean PURPLE_IS_CHAT(PurpleBListNode *node); +gboolean PURPLE_IS_BUDDY(PurpleBListNode *node); +gboolean PURPLE_IS_CONTACT(PurpleBListNode *node); +gboolean PURPLE_IS_GROUP(PurpleBListNode *node); gboolean PURPLE_IS_BUDDY_ONLINE(PurpleBuddy *buddy); -gboolean PURPLE_BLIST_NODE_HAS_FLAG(PurpleBlistNode *node, int flags); -gboolean PURPLE_BLIST_NODE_SHOULD_SAVE(PurpleBlistNode *node); +gboolean PURPLE_BLIST_NODE_HAS_FLAG(PurpleBListNode *node, int flags); +gboolean PURPLE_BLIST_NODE_SHOULD_SAVE(PurpleBListNode *node); /* connection.h */ gboolean PURPLE_CONNECTION_IS_CONNECTED(PurpleConnection *connection);
--- a/libpurple/dbus-server.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/dbus-server.c Wed Jul 03 22:18:55 2013 +0530 @@ -91,10 +91,10 @@ map_id_type = g_hash_table_new(g_direct_hash, g_direct_equal); map_node_id = g_hash_table_new(g_direct_hash, g_direct_equal); - PURPLE_DBUS_TYPE(PurpleBuddy)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); - PURPLE_DBUS_TYPE(PurpleContact)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); - PURPLE_DBUS_TYPE(PurpleChat)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); - PURPLE_DBUS_TYPE(PurpleGroup)->parent = PURPLE_DBUS_TYPE(PurpleBlistNode); + PURPLE_DBUS_TYPE(PurpleBuddy)->parent = PURPLE_DBUS_TYPE(PurpleBListNode); + PURPLE_DBUS_TYPE(PurpleContact)->parent = PURPLE_DBUS_TYPE(PurpleBListNode); + PURPLE_DBUS_TYPE(PurpleChat)->parent = PURPLE_DBUS_TYPE(PurpleBListNode); + PURPLE_DBUS_TYPE(PurpleGroup)->parent = PURPLE_DBUS_TYPE(PurpleBListNode); } void
--- a/libpurple/log.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/log.c Wed Jul 03 22:18:55 2013 +0530 @@ -1973,7 +1973,7 @@ char *log_path = g_build_filename(purple_user_dir(), "logs", NULL); GDir *log_dir = g_dir_open(log_path, 0, NULL); gchar *name; - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; g_free(log_path); if (log_dir == NULL)
--- a/libpurple/plugins/autoaccept.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/plugins/autoaccept.c Wed Jul 03 22:18:55 2013 +0530 @@ -86,7 +86,7 @@ file_recv_request_cb(PurpleXfer *xfer, gpointer handle) { PurpleAccount *account; - PurpleBlistNode *node; + PurpleBListNode *node; const char *pref; char *filename; char *dirname; @@ -180,7 +180,7 @@ } static void -save_cb(PurpleBlistNode *node, int choice) +save_cb(PurpleBListNode *node, int choice) { if (PURPLE_IS_BUDDY(node)) node = purple_blist_node_get_parent(node); @@ -189,7 +189,7 @@ } static void -set_auto_accept_settings(PurpleBlistNode *node, gpointer plugin) +set_auto_accept_settings(PurpleBListNode *node, gpointer plugin) { char *message; @@ -214,7 +214,7 @@ } static void -context_menu(PurpleBlistNode *node, GList **menu, gpointer plugin) +context_menu(PurpleBListNode *node, GList **menu, gpointer plugin) { PurpleMenuAction *action;
--- a/libpurple/plugins/buddynote.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/plugins/buddynote.c Wed Jul 03 22:18:55 2013 +0530 @@ -26,18 +26,18 @@ #include <version.h> static void -dont_do_it_cb(PurpleBlistNode *node, const char *note) +dont_do_it_cb(PurpleBListNode *node, const char *note) { } static void -do_it_cb(PurpleBlistNode *node, const char *note) +do_it_cb(PurpleBListNode *node, const char *note) { purple_blist_node_set_string(node, "notes", note); } static void -buddynote_edit_cb(PurpleBlistNode *node, gpointer data) +buddynote_edit_cb(PurpleBListNode *node, gpointer data) { const char *note; @@ -54,7 +54,7 @@ } static void -buddynote_extended_menu_cb(PurpleBlistNode *node, GList **m) +buddynote_extended_menu_cb(PurpleBListNode *node, GList **m) { PurpleMenuAction *bna = NULL;
--- a/libpurple/plugins/log_reader.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/plugins/log_reader.c Wed Jul 03 22:18:55 2013 +0530 @@ -662,7 +662,7 @@ } if (buddy) { - savedfilename = purple_blist_node_get_string((PurpleBlistNode *)buddy, + savedfilename = purple_blist_node_get_string((PurpleBListNode *)buddy, "log_reader_msn_log_filename"); } @@ -824,7 +824,7 @@ * detected for both buddies. */ if (buddy && logfile) { - PurpleBlistNode *node = (PurpleBlistNode *)buddy; + PurpleBListNode *node = (PurpleBListNode *)buddy; purple_blist_node_set_string(node, "log_reader_msn_log_filename", logfile); g_free(logfile); }
--- a/libpurple/plugins/perl/common/module.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/plugins/perl/common/module.h Wed Jul 03 22:18:55 2013 +0530 @@ -84,7 +84,7 @@ typedef PurpleAccountPrivacyType Purple__Account__PrivacyType; /* blist.h */ -typedef PurpleBlistNode * Purple__BuddyList__Node; +typedef PurpleBListNode * Purple__BuddyList__Node; typedef PurpleBuddyList * Purple__BuddyList; typedef PurpleBuddy * Purple__BuddyList__Buddy; typedef PurpleChat * Purple__BuddyList__Chat;
--- a/libpurple/plugins/signals-test.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/plugins/signals-test.c Wed Jul 03 22:18:55 2013 +0530 @@ -145,7 +145,7 @@ } static void -blist_node_added_cb(PurpleBlistNode *bnode, void *data) +blist_node_added_cb(PurpleBListNode *bnode, void *data) { const char *name; if (PURPLE_IS_GROUP(bnode)) @@ -163,7 +163,7 @@ } static void -blist_node_removed_cb(PurpleBlistNode *bnode, void *data) +blist_node_removed_cb(PurpleBListNode *bnode, void *data) { const char *name; if (PURPLE_IS_GROUP(bnode)) @@ -181,7 +181,7 @@ } static void -blist_node_aliased(PurpleBlistNode *node, const char *old_alias) +blist_node_aliased(PurpleBListNode *node, const char *old_alias) { PurpleContact *p = (PurpleContact *)node; PurpleBuddy *b = (PurpleBuddy *)node; @@ -208,7 +208,7 @@ } static void -blist_node_extended_menu_cb(PurpleBlistNode *node, void *data) +blist_node_extended_menu_cb(PurpleBListNode *node, void *data) { PurpleContact *p = (PurpleContact *)node; PurpleBuddy *b = (PurpleBuddy *)node;
--- a/libpurple/plugins/tcl/tcl_cmds.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/plugins/tcl/tcl_cmds.c Wed Jul 03 22:18:55 2013 +0530 @@ -382,9 +382,9 @@ return TCL_OK; } -static PurpleBlistNode *tcl_list_to_buddy(Tcl_Interp *interp, int count, Tcl_Obj **elems) +static PurpleBListNode *tcl_list_to_buddy(Tcl_Interp *interp, int count, Tcl_Obj **elems) { - PurpleBlistNode *node = NULL; + PurpleBListNode *node = NULL; PurpleAccount *account; char *name; char *type; @@ -414,7 +414,7 @@ Tcl_Obj *list, *tclgroup, *tclgrouplist, *tclcontact, *tclcontactlist, *tclbud, **elems, *result; const char *cmds[] = { "alias", "handle", "info", "list", NULL }; enum { CMD_BUDDY_ALIAS, CMD_BUDDY_HANDLE, CMD_BUDDY_INFO, CMD_BUDDY_LIST } cmd; - PurpleBlistNode *node, *gnode, *bnode; + PurpleBListNode *node, *gnode, *bnode; PurpleAccount *account; PurpleBuddy *bud; PurpleChat *cnode;
--- a/libpurple/plugins/tcl/tcl_signals.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/plugins/tcl/tcl_signals.c Wed Jul 03 22:18:55 2013 +0530 @@ -159,7 +159,7 @@ static void *tcl_signal_callback(va_list args, struct tcl_signal_handler *handler) { GString *name, *val; - PurpleBlistNode *node; + PurpleBListNode *node; int i; void *retval = NULL; Tcl_Obj *cmd, *arg, *result; @@ -290,9 +290,9 @@ case PURPLE_SUBTYPE_BLIST_CHAT: /* We're going to switch again for code-deduping */ if (purple_value_is_outgoing(handler->argtypes[i])) - node = *va_arg(args, PurpleBlistNode **); + node = *va_arg(args, PurpleBListNode **); else - node = va_arg(args, PurpleBlistNode *); + node = va_arg(args, PurpleBListNode *); if (PURPLE_IS_GROUP(node)) { arg = Tcl_NewListObj(0, NULL);
--- a/libpurple/protocols/bonjour/bonjour.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/bonjour/bonjour.c Wed Jul 03 22:18:55 2013 +0530 @@ -59,14 +59,14 @@ bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group) { PurpleAccount *account = purple_connection_get_account(conn); - PurpleBlistNode *cnode, *cnodenext, *bnode, *bnodenext; + PurpleBListNode *cnode, *cnodenext, *bnode, *bnodenext; PurpleBuddy *buddy; if (bonjour_group == NULL) return; /* Go through and remove all buddies that belong to this account */ - for (cnode = purple_blist_node_get_first_child((PurpleBlistNode *) bonjour_group); cnode; cnode = cnodenext) { + for (cnode = purple_blist_node_get_first_child((PurpleBListNode *) bonjour_group); cnode; cnode = cnodenext) { cnodenext = purple_blist_node_get_sibling_next(cnode); if (!PURPLE_IS_CONTACT(cnode)) continue;
--- a/libpurple/protocols/gg/gg.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/gg/gg.c Wed Jul 03 22:18:55 2013 +0530 @@ -192,7 +192,7 @@ ggp_str_to_uin(purple_buddy_get_name(buddy))); } -static void ggp_bmenu_add_to_chat(PurpleBlistNode *node, gpointer ignored) +static void ggp_bmenu_add_to_chat(PurpleBListNode *node, gpointer ignored) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -828,7 +828,7 @@ } } -static GList *ggp_blist_node_menu(PurpleBlistNode *node) +static GList *ggp_blist_node_menu(PurpleBListNode *node) { PurpleMenuAction *act; GList *m = NULL;
--- a/libpurple/protocols/gg/purplew.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/gg/purplew.c Wed Jul 03 22:18:55 2013 +0530 @@ -96,7 +96,7 @@ GList * ggp_purplew_group_get_buddies(PurpleGroup *group, PurpleAccount *account) { GList *buddies = NULL; - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; g_return_val_if_fail(group != NULL, NULL); @@ -122,7 +122,7 @@ GList * ggp_purplew_account_get_groups(PurpleAccount *account, gboolean exclusive) { - PurpleBlistNode *bnode; + PurpleBListNode *bnode; GList *groups = NULL; for (bnode = purple_blist_get_root(); bnode; bnode = bnode->next) {
--- a/libpurple/protocols/jabber/adhoccommands.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/jabber/adhoccommands.c Wed Jul 03 22:18:55 2013 +0530 @@ -223,7 +223,7 @@ } } -void jabber_adhoc_execute_action(PurpleBlistNode *node, gpointer data) { +void jabber_adhoc_execute_action(PurpleBListNode *node, gpointer data) { if (PURPLE_IS_BUDDY(node)) { JabberAdHocCommands *cmd = data; PurpleBuddy *buddy = (PurpleBuddy *) node;
--- a/libpurple/protocols/jabber/adhoccommands.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/jabber/adhoccommands.h Wed Jul 03 22:18:55 2013 +0530 @@ -34,7 +34,7 @@ void jabber_adhoc_execute(JabberStream *js, JabberAdHocCommands *cmd); -void jabber_adhoc_execute_action(PurpleBlistNode *node, gpointer data); +void jabber_adhoc_execute_action(PurpleBListNode *node, gpointer data); void jabber_adhoc_got_list(JabberStream *js, const char *from, xmlnode *query);
--- a/libpurple/protocols/jabber/buddy.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/jabber/buddy.c Wed Jul 03 22:18:55 2013 +0530 @@ -1227,7 +1227,7 @@ serv_got_alias(js->gc, bare_jid, serverside_alias); b = purple_find_buddy(account, bare_jid); if (b) { - purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", serverside_alias); + purple_blist_node_set_string((PurpleBListNode*)b, "servernick", serverside_alias); } g_free(serverside_alias); @@ -1692,7 +1692,7 @@ xmlnode_free(presence); } -static void jabber_buddy_make_invisible(PurpleBlistNode *node, gpointer data) +static void jabber_buddy_make_invisible(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -1707,7 +1707,7 @@ jabber_buddy_set_invisibility(js, purple_buddy_get_name(buddy), TRUE); } -static void jabber_buddy_make_visible(PurpleBlistNode *node, gpointer data) +static void jabber_buddy_make_visible(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -1736,7 +1736,7 @@ } static void -jabber_buddy_cancel_presence_notification(PurpleBlistNode *node, +jabber_buddy_cancel_presence_notification(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; @@ -1760,7 +1760,7 @@ g_free(msg); } -static void jabber_buddy_rerequest_auth(PurpleBlistNode *node, gpointer data) +static void jabber_buddy_rerequest_auth(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -1776,7 +1776,7 @@ } -static void jabber_buddy_unsubscribe(PurpleBlistNode *node, gpointer data) +static void jabber_buddy_unsubscribe(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -1791,7 +1791,7 @@ jabber_presence_subscription_set(js, purple_buddy_get_name(buddy), "unsubscribe"); } -static void jabber_buddy_login(PurpleBlistNode *node, gpointer data) { +static void jabber_buddy_login(PurpleBListNode *node, gpointer data) { if(PURPLE_IS_BUDDY(node)) { /* simply create a directed presence of the current status */ PurpleBuddy *buddy = (PurpleBuddy *) node; @@ -1817,7 +1817,7 @@ } } -static void jabber_buddy_logout(PurpleBlistNode *node, gpointer data) { +static void jabber_buddy_logout(PurpleBListNode *node, gpointer data) { if(PURPLE_IS_BUDDY(node)) { /* simply create a directed unavailable presence */ PurpleBuddy *buddy = (PurpleBuddy *) node; @@ -1930,7 +1930,7 @@ } GList * -jabber_blist_node_menu(PurpleBlistNode *node) +jabber_blist_node_menu(PurpleBListNode *node) { if(PURPLE_IS_BUDDY(node)) { return jabber_buddy_menu((PurpleBuddy *) node);
--- a/libpurple/protocols/jabber/buddy.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/jabber/buddy.h Wed Jul 03 22:18:55 2013 +0530 @@ -100,7 +100,7 @@ void jabber_buddy_remove_resource(JabberBuddy *jb, const char *resource); void jabber_buddy_get_info(PurpleConnection *gc, const char *who); -GList *jabber_blist_node_menu(PurpleBlistNode *node); +GList *jabber_blist_node_menu(PurpleBListNode *node); void jabber_set_info(PurpleConnection *gc, const char *info); void jabber_setup_set_info(PurplePluginAction *action);
--- a/libpurple/protocols/jabber/google/google.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/jabber/google/google.c Wed Jul 03 22:18:55 2013 +0530 @@ -143,7 +143,7 @@ -void google_buddy_node_chat(PurpleBlistNode *node, gpointer data) +void google_buddy_node_chat(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc;
--- a/libpurple/protocols/jabber/google/google.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/jabber/google/google.h Wed Jul 03 22:18:55 2013 +0530 @@ -30,6 +30,6 @@ char *jabber_google_format_to_html(const char *text); -void google_buddy_node_chat(PurpleBlistNode *node, gpointer data); +void google_buddy_node_chat(PurpleBListNode *node, gpointer data); #endif /* PURPLE_JABBER_GOOGLE_H_ */
--- a/libpurple/protocols/jabber/jabber.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/jabber/jabber.c Wed Jul 03 22:18:55 2013 +0530 @@ -2600,7 +2600,7 @@ PurpleChat *jabber_find_blist_chat(PurpleAccount *account, const char *name) { - PurpleBlistNode *gnode, *cnode; + PurpleBListNode *gnode, *cnode; JabberID *jid; if(!(jid = jabber_id_new(name)))
--- a/libpurple/protocols/jabber/roster.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/jabber/roster.c Wed Jul 03 22:18:55 2013 +0530 @@ -142,7 +142,7 @@ const char *servernick, *balias; /* Previously stored serverside / buddy-supplied alias */ - if((servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick"))) + if((servernick = purple_blist_node_get_string((PurpleBListNode*)b, "servernick"))) serv_got_alias(js->gc, jid, servernick); /* Alias from our roster retrieval */
--- a/libpurple/protocols/msn/msn.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/msn/msn.c Wed Jul 03 22:18:55 2013 +0530 @@ -770,7 +770,7 @@ } static void -show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored) +show_send_to_mobile_cb(PurpleBListNode *node, gpointer ignored) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -824,7 +824,7 @@ } static void -initiate_chat_cb(PurpleBlistNode *node, gpointer data) +initiate_chat_cb(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -1312,7 +1312,7 @@ } static GList * -msn_blist_node_menu(PurpleBlistNode *node) +msn_blist_node_menu(PurpleBListNode *node) { if(PURPLE_IS_BUDDY(node)) {
--- a/libpurple/protocols/mxit/mxit.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/mxit/mxit.c Wed Jul 03 22:18:55 2013 +0530 @@ -607,7 +607,7 @@ * @param node The entry in the buddy list. * @param ignored (not used) */ -static void mxit_reinvite( PurpleBlistNode *node, gpointer ignored ) +static void mxit_reinvite( PurpleBListNode *node, gpointer ignored ) { PurpleBuddy* buddy = (PurpleBuddy *) node; PurpleConnection* gc = purple_account_get_connection( purple_buddy_get_account( buddy ) ); @@ -628,7 +628,7 @@ * * @param node The entry in the buddy list. */ -static GList* mxit_blist_menu( PurpleBlistNode *node ) +static GList* mxit_blist_menu( PurpleBListNode *node ) { PurpleBuddy* buddy; struct contact* contact;
--- a/libpurple/protocols/myspace/user.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/myspace/user.c Wed Jul 03 22:18:55 2013 +0530 @@ -54,7 +54,7 @@ user = purple_buddy_get_protocol_data(buddy); if (create && !user) { - PurpleBlistNode *node = PURPLE_BLIST_NODE(buddy); + PurpleBListNode *node = PURPLE_BLIST_NODE(buddy); /* No MsimUser for this buddy; make one. */
--- a/libpurple/protocols/myspace/zap.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/myspace/zap.c Wed Jul 03 22:18:55 2013 +0530 @@ -155,7 +155,7 @@ /** Zap someone. Callback from msim_blist_node_menu zap menu. */ static void -msim_send_zap_from_menu(PurpleBlistNode *node, gpointer zap_num_ptr) +msim_send_zap_from_menu(PurpleBListNode *node, gpointer zap_num_ptr) { PurpleBuddy *buddy; PurpleAccount *account; @@ -184,7 +184,7 @@ /** Return menu, if any, for a buddy list node. */ GList * -msim_blist_node_menu(PurpleBlistNode *node) +msim_blist_node_menu(PurpleBListNode *node) { GList *menu, *zap_menu; GList *types;
--- a/libpurple/protocols/myspace/zap.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/myspace/zap.h Wed Jul 03 22:18:55 2013 +0530 @@ -22,7 +22,7 @@ GList *msim_attention_types(PurpleAccount *acct); gboolean msim_send_attention(PurpleConnection *gc, const gchar *username, guint code); -GList *msim_blist_node_menu(PurpleBlistNode *node); +GList *msim_blist_node_menu(PurpleBListNode *node); gboolean msim_incoming_zap(MsimSession *session, MsimMessage *msg); #endif /* !_MYSPACE_ZAP_H */
--- a/libpurple/protocols/novell/novell.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/novell/novell.c Wed Jul 03 22:18:55 2013 +0530 @@ -1228,9 +1228,9 @@ static void _remove_purple_buddies(NMUser *user) { - PurpleBlistNode *gnode; - PurpleBlistNode *cnode; - PurpleBlistNode *bnode; + PurpleBListNode *gnode; + PurpleBListNode *cnode; + PurpleBListNode *bnode; PurpleGroup *group; PurpleBuddy *buddy; GSList *rem_list = NULL; @@ -1615,7 +1615,7 @@ } static void -_initiate_conference_cb(PurpleBlistNode *node, gpointer ignored) +_initiate_conference_cb(PurpleBListNode *node, gpointer ignored) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -3443,7 +3443,7 @@ } static GList * -novell_blist_node_menu(PurpleBlistNode *node) +novell_blist_node_menu(PurpleBListNode *node) { GList *list = NULL; PurpleMenuAction *act;
--- a/libpurple/protocols/null/nullprpl.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/null/nullprpl.c Wed Jul 03 22:18:55 2013 +0530 @@ -311,7 +311,7 @@ return g_list_reverse(types); } -static void blist_example_menu_item(PurpleBlistNode *node, gpointer userdata) { +static void blist_example_menu_item(PurpleBListNode *node, gpointer userdata) { purple_debug_info("nullprpl", "example menu item clicked on user %s\n", ((PurpleBuddy *)node)->name); @@ -321,7 +321,7 @@ _("This is the callback for the nullprpl menu item.")); } -static GList *nullprpl_blist_node_menu(PurpleBlistNode *node) { +static GList *nullprpl_blist_node_menu(PurpleBListNode *node) { purple_debug_info("nullprpl", "providing buddy list context menu item\n"); if (PURPLE_IS_BUDDY(node)) {
--- a/libpurple/protocols/oscar/authorization.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/oscar/authorization.c Wed Jul 03 22:18:55 2013 +0530 @@ -91,7 +91,7 @@ } void -oscar_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored) +oscar_auth_sendrequest_menu(PurpleBListNode *node, gpointer ignored) { PurpleBuddy *buddy; PurpleConnection *gc;
--- a/libpurple/protocols/oscar/family_icq.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/oscar/family_icq.c Wed Jul 03 22:18:55 2013 +0530 @@ -425,7 +425,7 @@ g_snprintf(who, sizeof(who), "%u", info->uin); serv_got_alias(gc, who, utf8); if ((b = purple_find_buddy(account, who))) { - purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", utf8); + purple_blist_node_set_string((PurpleBListNode*)b, "servernick", utf8); } } g_free(utf8);
--- a/libpurple/protocols/oscar/oscar.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/oscar/oscar.c Wed Jul 03 22:18:55 2013 +0530 @@ -3743,7 +3743,7 @@ /* Make a list of what the groups each buddy is in */ for (cur = moved_buddies; cur != NULL; cur = cur->next) { - PurpleBlistNode *node = cur->data; + PurpleBListNode *node = cur->data; /* node is PurpleBuddy, parent is a PurpleContact. * We must go two levels up to get the Group */ groups = g_list_append(groups, @@ -3885,7 +3885,7 @@ if (aim_ssi_itemlist_exists(&od->ssi.local, bname)) { /* If the buddy is an ICQ user then load his nickname */ - const char *servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick"); + const char *servernick = purple_blist_node_get_string((PurpleBListNode*)b, "servernick"); char *alias; const char *balias; if (servernick) @@ -4856,7 +4856,7 @@ oscar_free_name_data(data); } -static void oscar_buddycb_edit_comment(PurpleBlistNode *node, gpointer ignore) { +static void oscar_buddycb_edit_comment(PurpleBListNode *node, gpointer ignore) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -4921,7 +4921,7 @@ static void oscar_ask_directim(gpointer object, gpointer ignored) { - PurpleBlistNode *node; + PurpleBListNode *node; PurpleBuddy *buddy; PurpleConnection *gc; gchar *buf; @@ -4957,7 +4957,7 @@ static void oscar_close_directim(gpointer object, gpointer ignored) { - PurpleBlistNode *node; + PurpleBListNode *node; PurpleBuddy *buddy; PurpleAccount *account; PurpleConnection *gc; @@ -4992,7 +4992,7 @@ } } -static void oscar_get_icqxstatusmsg(PurpleBlistNode *node, gpointer ignore) +static void oscar_get_icqxstatusmsg(PurpleBListNode *node, gpointer ignore) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -5015,7 +5015,7 @@ } static void -oscar_get_aim_info_cb(PurpleBlistNode *node, gpointer ignore) +oscar_get_aim_info_cb(PurpleBListNode *node, gpointer ignore) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -5119,7 +5119,7 @@ } -GList *oscar_blist_node_menu(PurpleBlistNode *node) { +GList *oscar_blist_node_menu(PurpleBListNode *node) { if(PURPLE_IS_BUDDY(node)) { return oscar_buddy_menu((PurpleBuddy *) node); } else {
--- a/libpurple/protocols/oscar/oscar.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/oscar/oscar.h Wed Jul 03 22:18:55 2013 +0530 @@ -1320,7 +1320,7 @@ /* authorization.c - OSCAR authorization requests */ void oscar_auth_sendrequest(PurpleConnection *gc, const char *name, const char *msg); -void oscar_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored); +void oscar_auth_sendrequest_menu(PurpleBListNode *node, gpointer ignored); void oscar_auth_recvrequest(PurpleConnection *gc, gchar *name, gchar *nick, gchar *reason); void oscar_set_aim_permdeny(PurpleConnection *gc);
--- a/libpurple/protocols/oscar/oscarcommon.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/oscar/oscarcommon.h Wed Jul 03 22:18:55 2013 +0530 @@ -67,7 +67,7 @@ char *oscar_status_text(PurpleBuddy *b); void oscar_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full); GList *oscar_status_types(PurpleAccount *account); -GList *oscar_blist_node_menu(PurpleBlistNode *node); +GList *oscar_blist_node_menu(PurpleBListNode *node); GList *oscar_chat_info(PurpleConnection *gc); GHashTable *oscar_chat_info_defaults(PurpleConnection *gc, const char *chat_name); void oscar_login(PurpleAccount *account);
--- a/libpurple/protocols/oscar/visibility.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/oscar/visibility.c Wed Jul 03 22:18:55 2013 +0530 @@ -55,7 +55,7 @@ } static void -visibility_cb(PurpleBlistNode *node, gpointer whatever) +visibility_cb(PurpleBListNode *node, gpointer whatever) { PurpleBuddy *buddy = PURPLE_BUDDY(node); const char* bname = purple_buddy_get_name(buddy);
--- a/libpurple/protocols/sametime/sametime.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/sametime/sametime.c Wed Jul 03 22:18:55 2013 +0530 @@ -565,11 +565,11 @@ if(aware->group) { PurpleGroup *group; PurpleBuddy *buddy; - PurpleBlistNode *bnode; + PurpleBListNode *bnode; group = g_hash_table_lookup(pd->group_list_map, list); buddy = purple_find_buddy_in_group(acct, id, group); - bnode = (PurpleBlistNode *) buddy; + bnode = (PurpleBListNode *) buddy; if(! buddy) { struct mwServiceResolve *srvc; @@ -578,7 +578,7 @@ buddy = purple_buddy_new(acct, id, NULL); purple_blist_add_buddy(buddy, NULL, group, NULL); - bnode = (PurpleBlistNode *) buddy; + bnode = (PurpleBListNode *) buddy; srvc = pd->srvc_resolve; query = g_list_append(NULL, (char *) id); @@ -659,7 +659,7 @@ */ PurpleAccount *acct; - PurpleBlistNode *gn, *cn, *bn; + PurpleBListNode *gn, *cn, *bn; PurpleGroup *grp; PurpleBuddy *bdy; @@ -870,8 +870,8 @@ purple_blist_alias_buddy(buddy, alias); purple_blist_server_alias_buddy(buddy, name); - purple_blist_node_set_string((PurpleBlistNode *) buddy, BUDDY_KEY_NAME, name); - purple_blist_node_set_int((PurpleBlistNode *) buddy, BUDDY_KEY_TYPE, type); + purple_blist_node_set_string((PurpleBListNode *) buddy, BUDDY_KEY_NAME, name); + purple_blist_node_set_int((PurpleBListNode *) buddy, BUDDY_KEY_TYPE, type); return buddy; } @@ -886,7 +886,7 @@ const char *n; GList *add; - n = purple_blist_node_get_string((PurpleBlistNode *) group, GROUP_KEY_NAME); + n = purple_blist_node_get_string((PurpleBListNode *) group, GROUP_KEY_NAME); if(! n) n = purple_group_get_name(group); idb.user = (char *) n; @@ -905,7 +905,7 @@ PurpleAccount *acct; PurpleGroup *group = NULL; PurpleBuddyList *blist; - PurpleBlistNode *gn; + PurpleBListNode *gn; const char *name, *alias, *owner; enum mwSametimeGroupType type; @@ -964,7 +964,7 @@ purple_blist_add_group(group, NULL); } - gn = (PurpleBlistNode *) group; + gn = (PurpleBListNode *) group; purple_blist_node_set_string(gn, GROUP_KEY_NAME, name); purple_blist_node_set_int(gn, GROUP_KEY_TYPE, type); @@ -1009,7 +1009,7 @@ static void group_clear(PurpleGroup *group, PurpleAccount *acct, gboolean del) { PurpleConnection *gc; GList *prune = NULL; - PurpleBlistNode *gn, *cn, *bn; + PurpleBListNode *gn, *cn, *bn; g_return_if_fail(group != NULL); @@ -1018,7 +1018,7 @@ gc = purple_account_get_connection(acct); g_return_if_fail(gc != NULL); - gn = (PurpleBlistNode *) group; + gn = (PurpleBListNode *) group; for(cn = purple_blist_node_get_first_child(gn); cn; @@ -1062,7 +1062,7 @@ struct mwSametimeGroup *stgroup) { PurpleAccount *acct; - PurpleBlistNode *gn, *cn, *bn; + PurpleBListNode *gn, *cn, *bn; GHashTable *stusers; GList *prune = NULL; @@ -1087,7 +1087,7 @@ } g_list_free(utl); - gn = (PurpleBlistNode *) group; + gn = (PurpleBListNode *) group; for(cn = purple_blist_node_get_first_child(gn); cn; @@ -1129,7 +1129,7 @@ PurpleAccount *acct; PurpleBuddyList *blist; - PurpleBlistNode *gn; + PurpleBListNode *gn; GHashTable *stgroups; GList *g_prune = NULL; @@ -1201,7 +1201,7 @@ /* prune all marked groups */ while(g_prune) { PurpleGroup *grp = g_prune->data; - PurpleBlistNode *gn = (PurpleBlistNode *) grp; + PurpleBListNode *gn = (PurpleBListNode *) grp; const char *owner; gboolean del = TRUE; @@ -1292,7 +1292,7 @@ } -static void blist_menu_nab(PurpleBlistNode *node, gpointer data) { +static void blist_menu_nab(PurpleBListNode *node, gpointer data) { struct mwPurplePluginData *pd = data; PurpleConnection *gc; @@ -1330,7 +1330,7 @@ /** The normal blist menu prpl function doesn't get called for groups, so we use the blist-node-extended-menu signal to trigger this handler */ -static void blist_node_menu_cb(PurpleBlistNode *node, +static void blist_node_menu_cb(PurpleBListNode *node, GList **menu, struct mwPurplePluginData *pd) { const char *owner; PurpleAccount *acct; @@ -1370,7 +1370,7 @@ /* lifted this from oldstatus, since HEAD doesn't do this at login anymore. */ static void blist_init(PurpleAccount *acct) { - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; GList *add_buds = NULL; for(gnode = purple_blist_get_root(); gnode; @@ -1410,7 +1410,7 @@ PurpleConnection *gc; PurpleAccount *acct; struct mwStorageUnit *unit; - PurpleBlistNode *l; + PurpleBListNode *l; gc = pd->gc; acct = purple_connection_get_account(gc); @@ -2593,7 +2593,7 @@ buddy = purple_find_buddy(acct, info->user_id); if(buddy) { - purple_blist_node_set_int((PurpleBlistNode *) buddy, + purple_blist_node_set_int((PurpleBListNode *) buddy, BUDDY_KEY_CLIENT, info->type); } } @@ -3536,7 +3536,7 @@ } -static void blist_menu_conf(PurpleBlistNode *node, gpointer data) { +static void blist_menu_conf(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy = (PurpleBuddy *) node; PurpleAccount *acct; PurpleConnection *gc; @@ -3573,7 +3573,7 @@ #if 0 -static void blist_menu_announce(PurpleBlistNode *node, gpointer data) { +static void blist_menu_announce(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy = (PurpleBuddy *) node; PurpleAccount *acct; PurpleConnection *gc; @@ -3608,7 +3608,7 @@ #endif -static GList *mw_prpl_blist_node_menu(PurpleBlistNode *node) { +static GList *mw_prpl_blist_node_menu(PurpleBListNode *node) { GList *l = NULL; PurpleMenuAction *act; @@ -4152,7 +4152,7 @@ purple_notify_user_info_add_pair_html(user_info, _("Full Name"), purple_buddy_get_server_alias(b)); } - type = purple_blist_node_get_int((PurpleBlistNode *) b, BUDDY_KEY_CLIENT); + type = purple_blist_node_get_int((PurpleBListNode *) b, BUDDY_KEY_CLIENT); if(type) { tmp2 = mw_client_name(type); if (tmp2) { @@ -4397,7 +4397,7 @@ /* same person, set the server alias */ purple_blist_server_alias_buddy(buddy, match->name); - purple_blist_node_set_string((PurpleBlistNode *) buddy, + purple_blist_node_set_string((PurpleBListNode *) buddy, BUDDY_KEY_NAME, match->name); /* subscribe to awareness */ @@ -4526,7 +4526,7 @@ GList *l; /* nab the saved server alias and stick it on the buddy */ - fn = purple_blist_node_get_string((PurpleBlistNode *) b, BUDDY_KEY_NAME); + fn = purple_blist_node_get_string((PurpleBListNode *) b, BUDDY_KEY_NAME); purple_blist_server_alias_buddy(b, fn); /* convert PurpleBuddy into a mwAwareIdBlock */ @@ -5330,7 +5330,7 @@ PurpleConnection *gc; PurpleAccount *acct; PurpleGroup *group; - PurpleBlistNode *gn; + PurpleBListNode *gn; const char *owner; g_return_if_fail(pd != NULL); @@ -5356,7 +5356,7 @@ } group = purple_group_new(name); - gn = (PurpleBlistNode *) group; + gn = (PurpleBListNode *) group; owner = purple_account_get_username(acct);
--- a/libpurple/protocols/silc/buddy.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/silc/buddy.c Wed Jul 03 22:18:55 2013 +0530 @@ -26,7 +26,7 @@ /***************************** Key Agreement *********************************/ static void -silcpurple_buddy_keyagr(PurpleBlistNode *node, gpointer data); +silcpurple_buddy_keyagr(PurpleBListNode *node, gpointer data); static void silcpurple_buddy_keyagr_do(PurpleConnection *gc, const char *name, @@ -320,7 +320,7 @@ } static void -silcpurple_buddy_keyagr(PurpleBlistNode *node, gpointer data) +silcpurple_buddy_keyagr(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleAccount *account; @@ -335,7 +335,7 @@ /**************************** Static IM Key **********************************/ static void -silcpurple_buddy_resetkey(PurpleBlistNode *node, gpointer data) +silcpurple_buddy_resetkey(PurpleBListNode *node, gpointer data) { PurpleBuddy *b; PurpleConnection *gc; @@ -463,7 +463,7 @@ } static void -silcpurple_buddy_privkey_menu(PurpleBlistNode *node, gpointer data) +silcpurple_buddy_privkey_menu(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -592,7 +592,7 @@ } static void -silcpurple_buddy_getkey_menu(PurpleBlistNode *node, gpointer data) +silcpurple_buddy_getkey_menu(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -606,7 +606,7 @@ } static void -silcpurple_buddy_showkey(PurpleBlistNode *node, gpointer data) +silcpurple_buddy_showkey(PurpleBListNode *node, gpointer data) { PurpleBuddy *b; PurpleConnection *gc; @@ -691,7 +691,7 @@ /* See if we have this buddy's public key. If we do use that to search the details. */ gpointer proto_data; - filename = purple_blist_node_get_string((PurpleBlistNode *)b, "public-key"); + filename = purple_blist_node_get_string((PurpleBListNode *)b, "public-key"); if (filename) { /* Call WHOIS. The user info is displayed in the WHOIS command reply. */ @@ -773,7 +773,7 @@ g_snprintf(filename, sizeof(filename) - 1, "%s" G_DIR_SEPARATOR_S "clientkeys" G_DIR_SEPARATOR_S "clientkey_%s.pub", silcpurple_silcdir(), fingerprint); - purple_blist_node_set_string((PurpleBlistNode *)b, "public-key", filename); + purple_blist_node_set_string((PurpleBListNode *)b, "public-key", filename); purple_prpl_got_user_status(purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), SILCPURPLE_STATUS_ID_OFFLINE, NULL); silc_free(fingerprint); silc_free(r->offline_pk); @@ -1004,7 +1004,7 @@ g_snprintf(filename, sizeof(filename) - 1, "%s" G_DIR_SEPARATOR_S "clientkeys" G_DIR_SEPARATOR_S "clientkey_%s.pub", silcpurple_silcdir(), fingerprint); - purple_blist_node_set_string((PurpleBlistNode *)b, "public-key", filename); + purple_blist_node_set_string((PurpleBListNode *)b, "public-key", filename); /* Update online status */ purple_prpl_got_user_status(purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), SILCPURPLE_STATUS_ID_AVAILABLE, NULL); @@ -1216,7 +1216,7 @@ SilcUInt16 cmd_ident; const char *name; - filename = purple_blist_node_get_string((PurpleBlistNode *)b, "public-key"); + filename = purple_blist_node_get_string((PurpleBListNode *)b, "public-key"); /* If the buddy is offline/nonexistent, we will require user to associate a public key with the buddy or the buddy @@ -1355,7 +1355,7 @@ /* See if we have this buddy's public key. If we do use that to search the details. */ - filename = purple_blist_node_get_string((PurpleBlistNode *)b, "public-key"); + filename = purple_blist_node_get_string((PurpleBListNode *)b, "public-key"); if (filename) { SilcPublicKey public_key; SilcAttributeObjPk userpk; @@ -1615,7 +1615,7 @@ } static void -silcpurple_buddy_kill(PurpleBlistNode *node, gpointer data) +silcpurple_buddy_kill(PurpleBListNode *node, gpointer data) { PurpleBuddy *b; PurpleConnection *gc; @@ -1638,7 +1638,7 @@ } *SilcPurpleBuddyWb; static void -silcpurple_buddy_wb(PurpleBlistNode *node, gpointer data) +silcpurple_buddy_wb(PurpleBListNode *node, gpointer data) { SilcPurpleBuddyWb wb = data; silcpurple_wb_init(wb->sg, wb->client_entry); @@ -1657,7 +1657,7 @@ GList *m = NULL; SilcPurpleBuddyWb wb; - pkfile = purple_blist_node_get_string((PurpleBlistNode *) buddy, "public-key"); + pkfile = purple_blist_node_get_string((PurpleBListNode *) buddy, "public-key"); client_entry = silc_client_get_client_by_id(sg->client, sg->conn, purple_buddy_get_protocol_data(buddy));
--- a/libpurple/protocols/silc/chat.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/silc/chat.c Wed Jul 03 22:18:55 2013 +0530 @@ -180,7 +180,7 @@ static void -silcpurple_chat_getinfo_menu(PurpleBlistNode *node, gpointer data) +silcpurple_chat_getinfo_menu(PurpleBListNode *node, gpointer data) { PurpleChat *chat = (PurpleChat *)node; PurpleAccount *account = purple_chat_get_account(chat); @@ -194,7 +194,7 @@ /************************** Channel Invite List ******************************/ static void -silcpurple_chat_invitelist(PurpleBlistNode *node, gpointer data); +silcpurple_chat_invitelist(PurpleBListNode *node, gpointer data); { } @@ -203,7 +203,7 @@ /**************************** Channel Ban List *******************************/ static void -silcpurple_chat_banlist(PurpleBlistNode *node, gpointer data); +silcpurple_chat_banlist(PurpleBListNode *node, gpointer data); { } @@ -366,7 +366,7 @@ f = purple_request_fields_get_field(fields, "passphrase"); val = purple_request_field_string_get_value(f); - curpass = purple_blist_node_get_string((PurpleBlistNode *)sgc->c, "passphrase"); + curpass = purple_blist_node_get_string((PurpleBListNode *)sgc->c, "passphrase"); if (!val && curpass) set = 0; @@ -380,11 +380,11 @@ if (set == 1) { silc_client_command_call(sg->client, sg->conn, NULL, "CMODE", sgc->channel->channel_name, "+a", val, NULL); - purple_blist_node_set_string((PurpleBlistNode *)sgc->c, "passphrase", val); + purple_blist_node_set_string((PurpleBListNode *)sgc->c, "passphrase", val); } else if (set == 0) { silc_client_command_call(sg->client, sg->conn, NULL, "CMODE", sgc->channel->channel_name, "-a", NULL); - purple_blist_node_remove_setting((PurpleBlistNode *)sgc->c, "passphrase"); + purple_blist_node_remove_setting((PurpleBListNode *)sgc->c, "passphrase"); } if (sgc->pubkeys) { @@ -421,7 +421,7 @@ fields = purple_request_fields_new(); if (sgc->c) - curpass = purple_blist_node_get_string((PurpleBlistNode *)sgc->c, "passphrase"); + curpass = purple_blist_node_get_string((PurpleBListNode *)sgc->c, "passphrase"); g = purple_request_field_group_new(NULL); f = purple_request_field_string_new("passphrase", _("Channel Passphrase"), @@ -490,7 +490,7 @@ } static void -silcpurple_chat_chauth(PurpleBlistNode *node, gpointer data) +silcpurple_chat_chauth(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -553,10 +553,10 @@ cn = purple_chat_new(sg->account, alias, comp); g = purple_chat_get_group(p->c); - purple_blist_add_chat(cn, g, (PurpleBlistNode *)p->c); + purple_blist_add_chat(cn, g, (PurpleBListNode *)p->c); /* Associate to a real channel */ - purple_blist_node_set_string((PurpleBlistNode *)cn, "parentch", p->channel); + purple_blist_node_set_string((PurpleBListNode *)cn, "parentch", p->channel); /* Join the group */ silcpurple_chat_join(sg->gc, comp); @@ -571,7 +571,7 @@ } static void -silcpurple_chat_prv(PurpleBlistNode *node, gpointer data) +silcpurple_chat_prv(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -627,7 +627,7 @@ /****************************** Channel Modes ********************************/ static void -silcpurple_chat_permanent_reset(PurpleBlistNode *node, gpointer data) +silcpurple_chat_permanent_reset(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -645,7 +645,7 @@ } static void -silcpurple_chat_permanent(PurpleBlistNode *node, gpointer data) +silcpurple_chat_permanent(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -718,7 +718,7 @@ } static void -silcpurple_chat_ulimit(PurpleBlistNode *node, gpointer data) +silcpurple_chat_ulimit(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -758,7 +758,7 @@ } static void -silcpurple_chat_resettopic(PurpleBlistNode *node, gpointer data) +silcpurple_chat_resettopic(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -776,7 +776,7 @@ } static void -silcpurple_chat_settopic(PurpleBlistNode *node, gpointer data) +silcpurple_chat_settopic(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -794,7 +794,7 @@ } static void -silcpurple_chat_resetprivate(PurpleBlistNode *node, gpointer data) +silcpurple_chat_resetprivate(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -812,7 +812,7 @@ } static void -silcpurple_chat_setprivate(PurpleBlistNode *node, gpointer data) +silcpurple_chat_setprivate(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -830,7 +830,7 @@ } static void -silcpurple_chat_resetsecret(PurpleBlistNode *node, gpointer data) +silcpurple_chat_resetsecret(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -848,7 +848,7 @@ } static void -silcpurple_chat_setsecret(PurpleBlistNode *node, gpointer data) +silcpurple_chat_setsecret(PurpleBListNode *node, gpointer data) { PurpleChat *chat; PurpleConnection *gc; @@ -871,7 +871,7 @@ } *SilcPurpleChatWb; static void -silcpurple_chat_wb(PurpleBlistNode *node, gpointer data) +silcpurple_chat_wb(PurpleBListNode *node, gpointer data) { SilcPurpleChatWb wb = data; silcpurple_wb_init_ch(wb->sg, wb->channel); @@ -1040,7 +1040,7 @@ SilcPurplePrvgrp grp; c = purple_blist_find_chat(sg->account, channel); - parentch = purple_blist_node_get_string((PurpleBlistNode *)c, "parentch"); + parentch = purple_blist_node_get_string((PurpleBListNode *)c, "parentch"); if (!parentch) return;
--- a/libpurple/protocols/silc/silc.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/silc/silc.c Wed Jul 03 22:18:55 2013 +0530 @@ -1530,7 +1530,7 @@ } -static GList *silcpurple_blist_node_menu(PurpleBlistNode *node) { +static GList *silcpurple_blist_node_menu(PurpleBListNode *node) { /* split this single menu building function back into the two original: one for buddies and one for chats */ if(PURPLE_IS_CHAT(node)) {
--- a/libpurple/protocols/yahoo/libymsg.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/yahoo/libymsg.c Wed Jul 03 22:18:55 2013 +0530 @@ -3870,7 +3870,7 @@ } } -static void yahoo_initiate_conference(PurpleBlistNode *node, gpointer data) { +static void yahoo_initiate_conference(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -3897,7 +3897,7 @@ yahoo_c_invite(gc, id, "Join my conference...", purple_buddy_get_name(buddy)); } -static void yahoo_presence_settings(PurpleBlistNode *node, gpointer data) { +static void yahoo_presence_settings(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; int presence_val = GPOINTER_TO_INT(data); @@ -3908,7 +3908,7 @@ yahoo_friend_update_presence(gc, purple_buddy_get_name(buddy), presence_val); } -static void yahoo_game(PurpleBlistNode *node, gpointer data) { +static void yahoo_game(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -4036,7 +4036,7 @@ } } -static void yahoo_addbuddyfrommenu_cb(PurpleBlistNode *node, gpointer data) +static void yahoo_addbuddyfrommenu_cb(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -4050,7 +4050,7 @@ } -static void yahoo_chat_goto_menu(PurpleBlistNode *node, gpointer data) +static void yahoo_chat_goto_menu(PurpleBListNode *node, gpointer data) { PurpleBuddy *buddy; PurpleConnection *gc; @@ -4101,7 +4101,7 @@ return m; } -static void yahoo_doodle_blist_node(PurpleBlistNode *node, gpointer data) +static void yahoo_doodle_blist_node(PurpleBListNode *node, gpointer data) { PurpleBuddy *b = (PurpleBuddy *)node; PurpleAccount *account = purple_buddy_get_account(b); @@ -4111,7 +4111,7 @@ } static void -yahoo_userinfo_blist_node(PurpleBlistNode *node, gpointer data) +yahoo_userinfo_blist_node(PurpleBListNode *node, gpointer data) { PurpleBuddy *b = (PurpleBuddy *)node; PurpleAccount *account = purple_buddy_get_account(b); @@ -4198,7 +4198,7 @@ return m; } -GList *yahoo_blist_node_menu(PurpleBlistNode *node) +GList *yahoo_blist_node_menu(PurpleBListNode *node) { if(PURPLE_IS_BUDDY(node)) { return yahoo_buddy_menu((PurpleBuddy *) node);
--- a/libpurple/protocols/yahoo/libymsg.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/yahoo/libymsg.h Wed Jul 03 22:18:55 2013 +0530 @@ -370,7 +370,7 @@ char *yahoo_status_text(PurpleBuddy *b); void yahoo_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full); GList *yahoo_status_types(PurpleAccount *account); -GList *yahoo_blist_node_menu(PurpleBlistNode *node); +GList *yahoo_blist_node_menu(PurpleBListNode *node); void yahoo_login(PurpleAccount *account); void yahoo_close(PurpleConnection *gc); int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what, PurpleMessageFlags flags);
--- a/libpurple/protocols/zephyr/zephyr.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/protocols/zephyr/zephyr.c Wed Jul 03 22:18:55 2013 +0530 @@ -2494,7 +2494,7 @@ static PurpleChat *zephyr_find_blist_chat(PurpleAccount *account, const char *name) { - PurpleBlistNode *gnode, *cnode; + PurpleBListNode *gnode, *cnode; /* XXX needs to be %host%,%canon%, and %me% clean */ for(gnode = purple_blist_get_root(); gnode;
--- a/libpurple/prpl.h Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/prpl.h Wed Jul 03 22:18:55 2013 +0530 @@ -285,7 +285,7 @@ * actions to be shown in (for example) the right-click menu for @a * node. */ - GList *(*blist_node_menu)(PurpleBlistNode *node); + GList *(*blist_node_menu)(PurpleBListNode *node); /** * Returns a list of #proto_chat_entry structs, which represent
--- a/libpurple/status.c Wed Jul 03 22:13:33 2013 +0530 +++ b/libpurple/status.c Wed Jul 03 22:18:55 2013 +0530 @@ -1243,7 +1243,7 @@ */ if (ops != NULL && ops->update != NULL) - ops->update(purple_get_blist(), (PurpleBlistNode *)buddy); + ops->update(purple_get_blist(), (PurpleBListNode *)buddy); } void
--- a/pidgin/gtkblist.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/gtkblist.c Wed Jul 03 22:18:55 2013 +0530 @@ -148,11 +148,11 @@ static GList *pidgin_blist_sort_methods = NULL; static struct pidgin_blist_sort_method *current_sort_method = NULL; -static void sort_method_none(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); - -static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); -static void sort_method_status(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); -static void sort_method_log_activity(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); +static void sort_method_none(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); + +static void sort_method_alphabetical(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); +static void sort_method_status(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); +static void sort_method_log_activity(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter); static guint sort_merge_id; static GtkActionGroup *sort_action_group = NULL; @@ -160,18 +160,18 @@ static GList *groups_tree(void); static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list); -static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change); +static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBListNode *node, gboolean status_change); static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data); -static void pidgin_blist_update(PurpleBuddyList *list, PurpleBlistNode *node); -static void pidgin_blist_update_group(PurpleBuddyList *list, PurpleBlistNode *node); -static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *node); -static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full); -static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter); +static void pidgin_blist_update(PurpleBuddyList *list, PurpleBListNode *node); +static void pidgin_blist_update_group(PurpleBuddyList *list, PurpleBListNode *node); +static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBListNode *node); +static char *pidgin_get_tooltip_text(PurpleBListNode *node, gboolean full); +static gboolean get_iter_from_node(PurpleBListNode *node, GtkTreeIter *iter); static gboolean buddy_is_displayable(PurpleBuddy *buddy); static void redo_buddy_list(PurpleBuddyList *list, gboolean remove, gboolean rerender); -static void pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node); -static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded); -static void pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node); +static void pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBListNode *node); +static char *pidgin_get_group_title(PurpleBListNode *gnode, gboolean expanded); +static void pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBListNode *node); static void set_urgent(void); typedef enum { @@ -351,7 +351,7 @@ purple_buddy_get_name(b), NULL); } -static void gtk_blist_menu_move_to_cb(GtkWidget *w, PurpleBlistNode *node) +static void gtk_blist_menu_move_to_cb(GtkWidget *w, PurpleBListNode *node) { PurpleGroup *group = g_object_get_data(G_OBJECT(w), "groupnode"); purple_blist_add_contact((PurpleContact *)node, group, NULL); @@ -435,7 +435,7 @@ { GtkTreeIter iter; GtkTreePath *path = NULL; - PurpleBlistNode *node; + PurpleBListNode *node; const char *text = NULL; path = gtk_tree_path_new_from_string (path_str); @@ -470,7 +470,7 @@ static void gtk_blist_do_personize(GList *merges) { - PurpleBlistNode *contact = NULL; + PurpleBListNode *contact = NULL; int max = 0; GList *tmp; @@ -479,9 +479,9 @@ * by which contact is higher in the list */ for (tmp = merges; tmp; tmp = tmp->next) { - PurpleBlistNode *node = tmp->data; - PurpleBlistNode *b; - PurpleBlistNodeType type; + PurpleBListNode *node = tmp->data; + PurpleBListNode *b; + PurpleBListNodeType type; int i = 0; type = purple_blist_node_get_type(node); @@ -512,7 +512,7 @@ /* Merge all those buddies into this contact */ for (tmp = merges; tmp; tmp = tmp->next) { - PurpleBlistNode *node = tmp->data; + PurpleBListNode *node = tmp->data; if (purple_blist_node_get_type(node) == PURPLE_BLIST_BUDDY_NODE) node = purple_blist_node_get_parent(node); @@ -528,10 +528,10 @@ } static void -gtk_blist_auto_personize(PurpleBlistNode *group, const char *alias) -{ - PurpleBlistNode *contact; - PurpleBlistNode *buddy; +gtk_blist_auto_personize(PurpleBListNode *group, const char *alias) +{ + PurpleBListNode *contact; + PurpleBListNode *buddy; GList *merges = NULL; int i = 0; char *a = g_utf8_casefold(alias, -1); @@ -587,7 +587,7 @@ { GtkTreeIter iter; GtkTreePath *path; - PurpleBlistNode *node; + PurpleBListNode *node; PurpleGroup *dest; editing_blist = FALSE; @@ -678,7 +678,7 @@ } } -static void chat_components_edit(GtkWidget *w, PurpleBlistNode *node) +static void chat_components_edit(GtkWidget *w, PurpleBListNode *node) { PurpleRequestFields *fields = purple_request_fields_new(); PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL); @@ -723,7 +723,7 @@ chat); } -static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBlistNode *node) +static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBListNode *node) { GtkTreeIter iter; GtkTreePath *path; @@ -753,7 +753,7 @@ purple_buddy_get_name(b), NULL); } -static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBlistNode *node) +static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBListNode *node) { PurpleLogType type; PurpleAccount *account; @@ -795,7 +795,7 @@ g_free(name); } -static void gtk_blist_menu_showoffline_cb(GtkWidget *w, PurpleBlistNode *node) +static void gtk_blist_menu_showoffline_cb(GtkWidget *w, PurpleBListNode *node) { if (PURPLE_IS_BUDDY(node)) { @@ -805,7 +805,7 @@ } else if (PURPLE_IS_CONTACT(node)) { - PurpleBlistNode *bnode; + PurpleBListNode *bnode; gboolean setting = !purple_blist_node_get_bool(node, "show_offline"); purple_blist_node_set_bool(node, "show_offline", setting); @@ -817,7 +817,7 @@ pidgin_blist_update(purple_get_blist(), bnode); } } else if (PURPLE_IS_GROUP(node)) { - PurpleBlistNode *cnode, *bnode; + PurpleBListNode *cnode, *bnode; gboolean setting = !purple_blist_node_get_bool(node, "show_offline"); purple_blist_node_set_bool(node, "show_offline", setting); @@ -1189,7 +1189,7 @@ static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { - PurpleBlistNode *node; + PurpleBListNode *node; gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), iter, NODE_COLUMN, &node, -1); @@ -1211,14 +1211,14 @@ static void gtk_blist_row_collapsed_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { - PurpleBlistNode *node; + PurpleBListNode *node; gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), iter, NODE_COLUMN, &node, -1); if (PURPLE_IS_GROUP(node)) { char *title; struct _pidgin_blist_node *gtknode; - PurpleBlistNode *cnode; + PurpleBListNode *cnode; title = pidgin_get_group_title(node, FALSE); @@ -1246,7 +1246,7 @@ } static void gtk_blist_row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data) { - PurpleBlistNode *node; + PurpleBListNode *node; GtkTreeIter iter; gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path); @@ -1275,7 +1275,7 @@ { GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview)); GtkTreeIter iter; - PurpleBlistNode *node; + PurpleBListNode *node; if(gtk_tree_selection_get_selected(sel, NULL, &iter)){ gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1); @@ -1295,7 +1295,7 @@ { GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview)); GtkTreeIter iter; - PurpleBlistNode *node; + PurpleBListNode *node; if(gtk_tree_selection_get_selected(sel, NULL, &iter)){ gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1); @@ -1315,7 +1315,7 @@ } static void -pidgin_blist_remove_cb (GtkWidget *w, PurpleBlistNode *node) +pidgin_blist_remove_cb (GtkWidget *w, PurpleBListNode *node) { if (PURPLE_IS_BUDDY(node)) { pidgin_dialogs_remove_buddy((PurpleBuddy*)node); @@ -1331,7 +1331,7 @@ struct _expand { GtkTreeView *treeview; GtkTreePath *path; - PurpleBlistNode *node; + PurpleBListNode *node; }; static gboolean @@ -1348,11 +1348,11 @@ } static void -pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node) +pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBListNode *node) { struct _pidgin_blist_node *gtknode; GtkTreeIter iter, parent; - PurpleBlistNode *bnode; + PurpleBListNode *bnode; GtkTreePath *path; if(!PURPLE_IS_CONTACT(node)) @@ -1383,9 +1383,9 @@ } static void -pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node) -{ - PurpleBlistNode *bnode; +pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBListNode *node) +{ + PurpleBListNode *bnode; struct _pidgin_blist_node *gtknode; if(!PURPLE_IS_CONTACT(node)) @@ -1401,7 +1401,7 @@ } static void -toggle_privacy(GtkWidget *widget, PurpleBlistNode *node) +toggle_privacy(GtkWidget *widget, PurpleBListNode *node) { PurpleBuddy *buddy; PurpleAccount *account; @@ -1427,7 +1427,7 @@ pidgin_blist_update(purple_get_blist(), node); } -void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, PurpleBlistNode *node) +void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, PurpleBListNode *node) { PurpleBuddy *buddy = (PurpleBuddy *)node; PurpleAccount *account; @@ -1443,7 +1443,7 @@ void pidgin_append_blist_node_proto_menu(GtkWidget *menu, PurpleConnection *gc, - PurpleBlistNode *node) + PurpleBListNode *node) { GList *l, *ll; PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); @@ -1459,7 +1459,7 @@ } void -pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBlistNode *node) +pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBListNode *node) { GList *l, *ll; @@ -1473,11 +1473,11 @@ static void -pidgin_append_blist_node_move_to_menu(GtkWidget *menu, PurpleBlistNode *node) +pidgin_append_blist_node_move_to_menu(GtkWidget *menu, PurpleBListNode *node) { GtkWidget *submenu; GtkWidget *menuitem; - PurpleBlistNode *group; + PurpleBListNode *group; menuitem = gtk_menu_item_new_with_label(_("Move to")); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); @@ -1504,7 +1504,7 @@ PurpleConnection *pc = NULL; PurplePluginProtocolInfo *prpl_info; PurpleContact *contact; - PurpleBlistNode *node; + PurpleBListNode *node; gboolean contact_expanded = FALSE; g_return_if_fail(menu); @@ -1612,7 +1612,7 @@ static gboolean gtk_blist_key_press_cb(GtkWidget *tv, GdkEventKey *event, gpointer data) { - PurpleBlistNode *node; + PurpleBListNode *node; GtkTreeIter iter, parent; GtkTreeSelection *sel; GtkTreePath *path; @@ -1701,7 +1701,7 @@ set_node_custom_icon_cb(const gchar *filename, gpointer data) { if (filename) { - PurpleBlistNode *node = (PurpleBlistNode*)data; + PurpleBListNode *node = (PurpleBListNode*)data; purple_buddy_icons_node_set_custom_icon_from_file(node, filename); @@ -1709,7 +1709,7 @@ } static void -set_node_custom_icon(GtkWidget *w, PurpleBlistNode *node) +set_node_custom_icon(GtkWidget *w, PurpleBListNode *node) { /* This doesn't keep track of the returned dialog (so that successive * calls could be made to re-display that dialog). Do we want that? */ @@ -1718,13 +1718,13 @@ } static void -remove_node_custom_icon(GtkWidget *w, PurpleBlistNode *node) +remove_node_custom_icon(GtkWidget *w, PurpleBListNode *node) { purple_buddy_icons_node_set_custom_icon(node, NULL, 0); } static void -add_buddy_icon_menu_items(GtkWidget *menu, PurpleBlistNode *node) +add_buddy_icon_menu_items(GtkWidget *menu, PurpleBListNode *node) { GtkWidget *item; @@ -1740,7 +1740,7 @@ } static GtkWidget * -create_group_menu (PurpleBlistNode *node, PurpleGroup *g) +create_group_menu (PurpleBListNode *node, PurpleGroup *g) { GtkWidget *menu; GtkWidget *item; @@ -1770,7 +1770,7 @@ } static GtkWidget * -create_chat_menu(PurpleBlistNode *node, PurpleChat *c) +create_chat_menu(PurpleBListNode *node, PurpleChat *c) { GtkWidget *menu; gboolean autojoin, persistent; @@ -1806,7 +1806,7 @@ } static GtkWidget * -create_contact_menu (PurpleBlistNode *node) +create_contact_menu (PurpleBListNode *node) { GtkWidget *menu; @@ -1836,7 +1836,7 @@ } static GtkWidget * -create_buddy_menu(PurpleBlistNode *node, PurpleBuddy *b) +create_buddy_menu(PurpleBListNode *node, PurpleBuddy *b) { struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node); GtkWidget *menu; @@ -1863,7 +1863,7 @@ 0, 0, NULL); } if(node->child->next) { - PurpleBlistNode *bnode; + PurpleBListNode *bnode; for(bnode = node->child; bnode; bnode = bnode->next) { PurpleBuddy *buddy = (PurpleBuddy*)bnode; @@ -1900,7 +1900,7 @@ } static gboolean -pidgin_blist_show_context_menu(PurpleBlistNode *node, +pidgin_blist_show_context_menu(PurpleBListNode *node, GtkMenuPositionFunc func, GtkWidget *tv, guint button, @@ -1958,7 +1958,7 @@ gtk_blist_button_press_cb(GtkWidget *tv, GdkEventButton *event, gpointer user_data) { GtkTreePath *path; - PurpleBlistNode *node; + PurpleBListNode *node; GtkTreeIter iter; GtkTreeSelection *sel; PurplePlugin *prpl = NULL; @@ -2028,7 +2028,7 @@ static gboolean pidgin_blist_popup_menu_cb(GtkWidget *tv, void *user_data) { - PurpleBlistNode *node; + PurpleBListNode *node; GtkTreeIter iter; GtkTreeSelection *sel; gboolean handled = FALSE; @@ -2283,7 +2283,7 @@ GtkTreeRowReference *ref = g_object_get_data(G_OBJECT(dc), "gtk-tree-view-source-row"); GtkTreePath *sourcerow = gtk_tree_row_reference_get_path(ref); GtkTreeIter iter; - PurpleBlistNode *node = NULL; + PurpleBListNode *node = NULL; if(!sourcerow) return; gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, sourcerow); @@ -2299,7 +2299,7 @@ GtkTreeRowReference *ref; GtkTreePath *sourcerow; GtkTreeIter iter; - PurpleBlistNode *node = NULL; + PurpleBListNode *node = NULL; PurpleBuddy *buddy; PurpleConnection *gc; GString *str; @@ -2382,14 +2382,14 @@ } if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE) && data) { - PurpleBlistNode *n = NULL; + PurpleBListNode *n = NULL; GtkTreePath *path = NULL; GtkTreeViewDropPosition position; memcpy(&n, data, sizeof(n)); if(gtk_tree_view_get_dest_row_at_pos(GTK_TREE_VIEW(widget), x, y, &path, &position)) { /* if we're here, I think it means the drop is ok */ GtkTreeIter iter; - PurpleBlistNode *node; + PurpleBListNode *node; struct _pidgin_blist_node *gtknode; gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), @@ -2537,7 +2537,7 @@ x, y, &path, &position)) { GtkTreeIter iter; - PurpleBlistNode *node; + PurpleBListNode *node; gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path); @@ -2597,7 +2597,7 @@ x, y, &path, &position)) { GtkTreeIter iter; - PurpleBlistNode *node; + PurpleBListNode *node; gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path); @@ -2631,7 +2631,7 @@ x, y, &path, &position)) { GtkTreeIter iter; - PurpleBlistNode *node; + PurpleBListNode *node; gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path); @@ -2680,7 +2680,7 @@ } -static GdkPixbuf *pidgin_blist_get_buddy_icon(PurpleBlistNode *node, +static GdkPixbuf *pidgin_blist_get_buddy_icon(PurpleBListNode *node, gboolean scaled, gboolean greyed) { gsize len; @@ -2904,7 +2904,7 @@ return td; } -static struct tooltip_data * create_tip_for_node(PurpleBlistNode *node, gboolean full) +static struct tooltip_data * create_tip_for_node(PurpleBListNode *node, gboolean full) { struct tooltip_data *td = g_new0(struct tooltip_data, 1); PurpleAccount *account = NULL; @@ -3187,7 +3187,7 @@ static gboolean pidgin_blist_create_tooltip_for_node(GtkWidget *widget, gpointer data, int *w, int *h) { - PurpleBlistNode *node = data; + PurpleBListNode *node = data; int width, height; GList *list; int max_text_width = 0; @@ -3221,7 +3221,7 @@ gtkblist->tooltipdata = g_list_append(gtkblist->tooltipdata, td); } } else if (PURPLE_IS_CONTACT(node)) { - PurpleBlistNode *child; + PurpleBListNode *child; PurpleBuddy *b = purple_contact_get_priority_buddy((PurpleContact *)node); for(child = node->child; child; child = child->next) @@ -3264,7 +3264,7 @@ { GtkTreePath *path; GtkTreeIter iter; - PurpleBlistNode *node; + PurpleBListNode *node; struct _pidgin_blist_node *gtknode; if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y + (gtkblist->tip_rect.height/2), @@ -3317,7 +3317,7 @@ purple_blist_node_get_bool(PURPLE_BLIST_NODE(buddy), "show_offline"))); } -void pidgin_blist_draw_tooltip(PurpleBlistNode *node, GtkWidget *widget) +void pidgin_blist_draw_tooltip(PurpleBListNode *node, GtkWidget *widget) { pidgin_tooltip_show(widget, node, pidgin_blist_create_tooltip_for_node, pidgin_blist_paint_tip); } @@ -3375,7 +3375,7 @@ gpointer null, int *w, int *h) { GtkTreeIter iter; - PurpleBlistNode *node; + PurpleBListNode *node; gboolean editable = FALSE; /* If we're editing a cell (e.g. alias editing), don't show the tooltip */ @@ -3821,7 +3821,7 @@ * Private Utility functions * *********************************************************/ -static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full) +static char *pidgin_get_tooltip_text(PurpleBListNode *node, gboolean full) { GString *str = g_string_new(""); PurplePlugin *prpl; @@ -3996,7 +3996,7 @@ if (full && c && !PURPLE_IS_BUDDY_ONLINE(b)) { struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(c)); - PurpleBlistNode *bnode; + PurpleBListNode *bnode; int lastseen = 0; if (gtknode && (!gtknode->contact_expanded || PURPLE_IS_CONTACT(node))) @@ -4005,7 +4005,7 @@ * an expanded contact itself so we show the most recent * (largest) last_seen time for any of the buddies under * the contact. */ - for (bnode = ((PurpleBlistNode *)c)->child ; bnode != NULL ; bnode = bnode->next) + for (bnode = ((PurpleBListNode *)c)->child ; bnode != NULL ; bnode = bnode->next) { int value = purple_blist_node_get_int(bnode, "last_seen"); if (value > lastseen) @@ -4121,7 +4121,7 @@ } GdkPixbuf * -pidgin_blist_get_emblem(PurpleBlistNode *node) +pidgin_blist_get_emblem(PurpleBListNode *node) { PurpleBuddy *buddy = NULL; struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node); @@ -4227,7 +4227,7 @@ GdkPixbuf * -pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size) +pidgin_blist_get_status_icon(PurpleBListNode *node, PidginStatusIconSize size) { GdkPixbuf *ret; const char *icon = NULL; @@ -4576,7 +4576,7 @@ static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list) { - PurpleBlistNode *gnode, *cnode; + PurpleBListNode *gnode, *cnode; if (gtk_blist_visibility == GDK_VISIBILITY_FULLY_OBSCURED || !gtk_widget_get_visible(gtkblist->window)) @@ -4602,7 +4602,7 @@ return TRUE; } -static void pidgin_blist_hide_node(PurpleBuddyList *list, PurpleBlistNode *node, gboolean update) +static void pidgin_blist_hide_node(PurpleBuddyList *list, PurpleBListNode *node, gboolean update) { struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node); GtkTreeIter iter; @@ -4834,7 +4834,7 @@ static void written_msg_update_ui_cb(PurpleAccount *account, const char *who, const char *message, - PurpleConversation *conv, PurpleMessageFlags flag, PurpleBlistNode *node) + PurpleConversation *conv, PurpleMessageFlags flag, PurpleBListNode *node) { PidginBlistNode *ui = purple_blist_node_get_ui_data(node); if (ui->conv.conv != conv || !pidgin_conv_is_hidden(PIDGIN_CONVERSATION(conv)) || @@ -4849,7 +4849,7 @@ } static void -displayed_msg_update_ui_cb(PidginConversation *gtkconv, PurpleBlistNode *node) +displayed_msg_update_ui_cb(PidginConversation *gtkconv, PurpleBListNode *node) { PidginBlistNode *ui = purple_blist_node_get_ui_data(node); if (ui->conv.conv != gtkconv->active_conv) @@ -4867,7 +4867,7 @@ if (PURPLE_IS_IM_CONVERSATION(conv)) { GSList *buddies = purple_find_buddies(account, purple_conversation_get_name(conv)); while (buddies) { - PurpleBlistNode *buddy = buddies->data; + PurpleBListNode *buddy = buddies->data; struct _pidgin_blist_node *ui = purple_blist_node_get_ui_data(buddy); buddies = g_slist_delete_link(buddies, buddies); if (!ui) @@ -4916,12 +4916,12 @@ blist->ui_data = gtkblist; } -static void pidgin_blist_new_node(PurpleBlistNode *node) +static void pidgin_blist_new_node(PurpleBListNode *node) { purple_blist_node_set_ui_data(node, g_new0(struct _pidgin_blist_node, 1)); } -gboolean pidgin_blist_node_is_contact_expanded(PurpleBlistNode *node) +gboolean pidgin_blist_node_is_contact_expanded(PurpleBListNode *node) { if (PURPLE_IS_BUDDY(node)) { node = node->parent; @@ -4965,7 +4965,7 @@ { GtkTreeSelection *sel; GtkTreeIter iter; - PurpleBlistNode *node = NULL; + PurpleBListNode *node = NULL; sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview)); if (gtk_tree_selection_get_selected(sel, NULL, &iter)) @@ -5631,7 +5631,7 @@ gpointer data) { PurpleBuddyList *list = data; - PurpleBlistNode *node = list->root; + PurpleBListNode *node = list->root; while (node) { pidgin_blist_update_group(list, node); node = node->next; @@ -5847,7 +5847,7 @@ pidgin_blist_search_equal_func(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer data) { - PurpleBlistNode *node = NULL; + PurpleBListNode *node = NULL; gboolean res = TRUE; const char *compare = NULL; @@ -6330,7 +6330,7 @@ static void redo_buddy_list(PurpleBuddyList *list, gboolean remove, gboolean rerender) { - PurpleBlistNode *node; + PurpleBListNode *node; gtkblist = PIDGIN_BLIST(list); if(!gtkblist || !gtkblist->treeview) @@ -6374,7 +6374,7 @@ gtkblist->refresh_timer = purple_timeout_add_seconds(30,(GSourceFunc)pidgin_blist_refresh_timer, blist); } -static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter) { +static gboolean get_iter_from_node(PurpleBListNode *node, GtkTreeIter *iter) { struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node); GtkTreePath *path; @@ -6402,7 +6402,7 @@ return TRUE; } -static void pidgin_blist_remove(PurpleBuddyList *list, PurpleBlistNode *node) +static void pidgin_blist_remove(PurpleBuddyList *list, PurpleBListNode *node) { struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node); @@ -6432,9 +6432,9 @@ } } -static gboolean do_selection_changed(PurpleBlistNode *new_selection) -{ - PurpleBlistNode *old_selection = NULL; +static gboolean do_selection_changed(PurpleBListNode *new_selection) +{ + PurpleBListNode *old_selection = NULL; /* test for gtkblist because crazy timeout means we can be called after the blist is gone */ if (gtkblist && new_selection != gtkblist->selected_node) { @@ -6451,7 +6451,7 @@ static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data) { - PurpleBlistNode *new_selection = NULL; + PurpleBListNode *new_selection = NULL; GtkTreeIter iter; if(gtk_tree_selection_get_selected(selection, NULL, &iter)){ @@ -6470,7 +6470,7 @@ } } -static gboolean insert_node(PurpleBuddyList *list, PurpleBlistNode *node, GtkTreeIter *iter) +static gboolean insert_node(PurpleBuddyList *list, PurpleBListNode *node, GtkTreeIter *iter) { GtkTreeIter parent_iter = {0, NULL, NULL, NULL}, cur, *curptr = NULL; struct _pidgin_blist_node *gtknode = purple_blist_node_get_ui_data(node); @@ -6533,7 +6533,7 @@ static gboolean pidgin_blist_group_has_show_offline_buddy(PurpleGroup *group) { - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; gnode = PURPLE_BLIST_NODE(group); for(cnode = gnode->child; cnode; cnode = cnode->next) { @@ -6553,11 +6553,11 @@ * group, but has much better algorithmic performance with a pre-known buddy. */ static void pidgin_blist_update_group(PurpleBuddyList *list, - PurpleBlistNode *node) + PurpleBListNode *node) { gint count; PurpleGroup *group; - PurpleBlistNode* gnode; + PurpleBListNode* gnode; gboolean show = FALSE, show_offline = FALSE; g_return_if_fail(node != NULL); @@ -6642,13 +6642,13 @@ } } -static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded) +static char *pidgin_get_group_title(PurpleBListNode *gnode, gboolean expanded) { PurpleGroup *group; gboolean selected; char group_count[12] = ""; char *mark, *esc; - PurpleBlistNode *selected_node = NULL; + PurpleBListNode *selected_node = NULL; GtkTreeIter iter; PidginThemeFont *pair; gchar const *text_color, *text_font; @@ -6700,7 +6700,7 @@ return mark; } -static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBlistNode *node) +static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBListNode *node) { PurplePresence *presence = purple_buddy_get_presence(buddy); GdkPixbuf *status, *avatar, *emblem, *prpl_icon; @@ -6809,9 +6809,9 @@ /* This is a variation on the original gtk_blist_update_contact. Here we can know in advance which buddy has changed so we can just update that */ -static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *node) -{ - PurpleBlistNode *cnode; +static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBListNode *node) +{ + PurpleBListNode *cnode; PurpleContact *contact; PurpleBuddy *buddy; gboolean biglist = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"); @@ -6905,7 +6905,7 @@ -static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change) +static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBListNode *node, gboolean status_change) { PurpleBuddy *buddy; struct _pidgin_blist_node *gtkparentnode; @@ -6937,7 +6937,7 @@ } -static void pidgin_blist_update_chat(PurpleBuddyList *list, PurpleBlistNode *node) +static void pidgin_blist_update_chat(PurpleBuddyList *list, PurpleBListNode *node) { PurpleChat *chat; @@ -7049,7 +7049,7 @@ } } -static void pidgin_blist_update(PurpleBuddyList *list, PurpleBlistNode *node) +static void pidgin_blist_update(PurpleBuddyList *list, PurpleBListNode *node) { if (list) gtkblist = PIDGIN_BLIST(list); @@ -7158,7 +7158,7 @@ { static GList *list = NULL; PurpleGroup *g; - PurpleBlistNode *gnode; + PurpleBListNode *gnode; g_list_free(list); list = NULL; @@ -7655,7 +7655,7 @@ static gboolean autojoin_cb(PurpleConnection *gc, gpointer data) { PurpleAccount *account = purple_connection_get_account(gc); - PurpleBlistNode *gnode, *cnode; + PurpleBListNode *gnode, *cnode; for(gnode = purple_get_blist()->root; gnode; gnode = gnode->next) { if(!PURPLE_IS_GROUP(gnode)) @@ -7893,9 +7893,9 @@ ** Sort Methods ******************************************/ -static void sort_method_none(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter parent_iter, GtkTreeIter *cur, GtkTreeIter *iter) -{ - PurpleBlistNode *sibling = node->prev; +static void sort_method_none(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter parent_iter, GtkTreeIter *cur, GtkTreeIter *iter) +{ + PurpleBListNode *sibling = node->prev; GtkTreeIter sibling_iter; if (cur != NULL) { @@ -7912,7 +7912,7 @@ sibling ? &sibling_iter : NULL); } -static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter) +static void sort_method_alphabetical(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter) { GtkTreeIter more_z; @@ -7933,7 +7933,7 @@ } do { - PurpleBlistNode *n; + PurpleBListNode *n; const char *this_name; int cmp; @@ -7972,7 +7972,7 @@ } } -static void sort_method_status(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter) +static void sort_method_status(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter) { GtkTreeIter more_z; @@ -8000,7 +8000,7 @@ } do { - PurpleBlistNode *n; + PurpleBListNode *n; gint name_cmp; gint presence_cmp; @@ -8054,7 +8054,7 @@ } } -static void sort_method_log_activity(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter) +static void sort_method_log_activity(PurpleBListNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter) { GtkTreeIter more_z; @@ -8067,7 +8067,7 @@ } if(PURPLE_IS_CONTACT(node)) { - PurpleBlistNode *n; + PurpleBListNode *n; PurpleBuddy *buddy; for (n = node->child; n; n = n->next) { buddy = (PurpleBuddy*)n; @@ -8096,8 +8096,8 @@ } do { - PurpleBlistNode *n; - PurpleBlistNode *n2; + PurpleBListNode *n; + PurpleBListNode *n2; PurpleBuddy *buddy; int cmp;
--- a/pidgin/gtkblist.h Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/gtkblist.h Wed Jul 03 22:18:55 2013 +0530 @@ -96,12 +96,12 @@ GdkRectangle contact_rect; /**< This is the bounding rectangle of the contact node and its children. This is used for auto-expand on mouseover. */ - PurpleBlistNode *mouseover_contact; /**< This is the contact currently mouse-over expanded */ + PurpleBListNode *mouseover_contact; /**< This is the contact currently mouse-over expanded */ GtkWidget *tipwindow; /**< The window used by the tooltip */ GList *tooltipdata; /**< The data for each "chunk" of the tooltip */ - PurpleBlistNode *selected_node; /**< The currently selected node */ + PurpleBListNode *selected_node; /**< The currently selected node */ GtkWidget *scrollbook; /**< Scrollbook for alerts */ GtkWidget *headline; /**< Widget for headline notifications */ @@ -193,12 +193,12 @@ * @return A GdkPixbuf for the emblem to show, or NULL */ GdkPixbuf * -pidgin_blist_get_emblem(PurpleBlistNode *node); +pidgin_blist_get_emblem(PurpleBListNode *node); /** * Useful for the buddy ticker */ -GdkPixbuf *pidgin_blist_get_status_icon(PurpleBlistNode *node, +GdkPixbuf *pidgin_blist_get_status_icon(PurpleBListNode *node, PidginStatusIconSize size); /** @@ -210,7 +210,7 @@ * @param node The node in question. * @return A boolean indicating if @a node is part of an expanded contact. */ -gboolean pidgin_blist_node_is_contact_expanded(PurpleBlistNode *node); +gboolean pidgin_blist_node_is_contact_expanded(PurpleBListNode *node); /** * Intelligently toggles the visibility of the buddy list. If the buddy @@ -260,7 +260,7 @@ * @name GTK+ Buddy List sorting functions **************************************************************************/ -typedef void (*pidgin_blist_sort_function)(PurpleBlistNode *new, PurpleBuddyList *blist, GtkTreeIter group, GtkTreeIter *cur, GtkTreeIter *iter); +typedef void (*pidgin_blist_sort_function)(PurpleBListNode *new, PurpleBuddyList *blist, GtkTreeIter group, GtkTreeIter *cur, GtkTreeIter *iter); /** * Gets the current list of sort methods. @@ -335,22 +335,22 @@ void pidgin_blist_joinchat_show(void); /** - * Appends the privacy menu items for a PurpleBlistNode + * Appends the privacy menu items for a PurpleBListNode * TODO: Rename these. */ -void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, PurpleBlistNode *node); +void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, PurpleBListNode *node); /** - * Appends the protocol specific menu items for a PurpleBlistNode + * Appends the protocol specific menu items for a PurpleBListNode * TODO: Rename these. */ -void pidgin_append_blist_node_proto_menu (GtkWidget *menu, PurpleConnection *gc, PurpleBlistNode *node); +void pidgin_append_blist_node_proto_menu (GtkWidget *menu, PurpleConnection *gc, PurpleBListNode *node); /** - * Appends the extended menu items for a PurpleBlistNode + * Appends the extended menu items for a PurpleBListNode * TODO: Rename these. */ -void pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBlistNode *node); +void pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBListNode *node); /** * Sets a headline notification @@ -386,7 +386,7 @@ * @param node The buddy list node to show a tooltip for * @param widget The widget to draw the tooltip on */ -void pidgin_blist_draw_tooltip(PurpleBlistNode *node, GtkWidget *widget); +void pidgin_blist_draw_tooltip(PurpleBListNode *node, GtkWidget *widget); /** * Destroys the current (if any) Buddy List tooltip
--- 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) {
--- a/pidgin/gtkdialogs.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/gtkdialogs.c Wed Jul 03 22:18:55 2013 +0530 @@ -1111,7 +1111,7 @@ buddies = purple_find_buddies(account, username); 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); @@ -1230,10 +1230,10 @@ static void pidgin_dialogs_remove_contact_cb(PurpleContact *contact) { - PurpleBlistNode *bnode, *cnode; + PurpleBListNode *bnode, *cnode; PurpleGroup *group; - cnode = (PurpleBlistNode *)contact; + cnode = (PurpleBListNode *)contact; group = (PurpleGroup*)cnode->parent; for (bnode = cnode->child; bnode; bnode = bnode->next) { PurpleBuddy *buddy = (PurpleBuddy*)bnode; @@ -1319,9 +1319,9 @@ static void pidgin_dialogs_remove_group_cb(PurpleGroup *group) { - PurpleBlistNode *cnode, *bnode; + PurpleBListNode *cnode, *bnode; - cnode = ((PurpleBlistNode*)group)->child; + cnode = ((PurpleBListNode*)group)->child; while (cnode) { if (PURPLE_IS_CONTACT(cnode)) {
--- a/pidgin/gtklog.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/gtklog.c Wed Jul 03 22:18:55 2013 +0530 @@ -740,7 +740,7 @@ void pidgin_log_show_contact(PurpleContact *contact) { struct log_viewer_hash_t *ht; - PurpleBlistNode *child; + PurpleBListNode *child; PidginLogViewer *lv = NULL; GList *logs = NULL; GdkPixbuf *pixbuf; @@ -763,7 +763,7 @@ return; } - for (child = purple_blist_node_get_first_child((PurpleBlistNode*)contact) ; + for (child = purple_blist_node_get_first_child((PurpleBListNode*)contact) ; child != NULL ; child = purple_blist_node_get_sibling_next(child)) { const char *buddy_name;
--- a/pidgin/gtkpounce.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/gtkpounce.c Wed Jul 03 22:18:55 2013 +0530 @@ -430,7 +430,7 @@ if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE)) { - PurpleBlistNode *node = NULL; + PurpleBListNode *node = NULL; PurpleBuddy *buddy; memcpy(&node, sd_data, sizeof(node));
--- a/pidgin/gtkutils.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/gtkutils.c Wed Jul 03 22:18:55 2013 +0530 @@ -1387,7 +1387,7 @@ break; } contact = purple_buddy_get_contact(buddy); - purple_buddy_icons_node_set_custom_icon_from_file((PurpleBlistNode*)contact, data->filename); + purple_buddy_icons_node_set_custom_icon_from_file((PurpleBListNode*)contact, data->filename); break; case DND_FILE_TRANSFER: serv_send_file(purple_account_get_connection(data->account), data->who, data->filename); @@ -1964,7 +1964,7 @@ static void add_completion_list(PidginCompletionData *data) { - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; PidginFilterBuddyCompletionEntryFunc filter_func = data->filter_func; gpointer user_data = data->filter_func_user_data; GHashTable *sets;
--- a/pidgin/plugins/cap/cap.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/plugins/cap/cap.c Wed Jul 03 22:18:55 2013 +0530 @@ -437,7 +437,7 @@ } /* drawing-tooltip */ -static void drawing_tooltip(PurpleBlistNode *node, GString *text, gboolean full) { +static void drawing_tooltip(PurpleBListNode *node, GString *text, gboolean full) { if(node->type == PURPLE_BLIST_BUDDY_NODE) { PurpleBuddy *buddy = (PurpleBuddy *)node; CapStatistics *stats = get_stats_for(buddy);
--- a/pidgin/plugins/cap/cap.h Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/plugins/cap/cap.h Wed Jul 03 22:18:55 2013 +0530 @@ -99,7 +99,7 @@ /* buddy-signed-off */ static void buddy_signed_off(PurpleBuddy *buddy); /* drawing-tooltip */ -static void drawing_tooltip(PurpleBlistNode *node, GString *text, gboolean full); +static void drawing_tooltip(PurpleBListNode *node, GString *text, gboolean full); /* signed-on */ static void signed_on(PurpleConnection *gc); /* signed-off */
--- a/pidgin/plugins/gevolution/gevo-util.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/plugins/gevolution/gevo-util.c Wed Jul 03 22:18:55 2013 +0530 @@ -63,7 +63,7 @@ { static GList *list = NULL; PurpleGroup *g; - PurpleBlistNode *gnode; + PurpleBListNode *gnode; g_list_free(list); list = NULL;
--- a/pidgin/plugins/gevolution/gevolution.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/plugins/gevolution/gevolution.c Wed Jul 03 22:18:55 2013 +0530 @@ -218,14 +218,14 @@ } static void -menu_item_activate_cb(PurpleBlistNode *node, gpointer user_data) +menu_item_activate_cb(PurpleBListNode *node, gpointer user_data) { PurpleBuddy *buddy = (PurpleBuddy *)node; gevo_associate_buddy_dialog_new(buddy); } static void -menu_item_send_mail_activate_cb(PurpleBlistNode *node, gpointer user_data) +menu_item_send_mail_activate_cb(PurpleBListNode *node, gpointer user_data) { PurpleBuddy *buddy = (PurpleBuddy *)node; char *mail = NULL; @@ -260,7 +260,7 @@ } static void -blist_node_extended_menu_cb(PurpleBlistNode *node, GList **menu) +blist_node_extended_menu_cb(PurpleBListNode *node, GList **menu) { PurpleMenuAction *act; PurpleBuddy *buddy;
--- a/pidgin/plugins/gtk-signals-test.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/plugins/gtk-signals-test.c Wed Jul 03 22:18:55 2013 +0530 @@ -49,7 +49,7 @@ } static void -blist_drawing_tooltip_cb(PurpleBlistNode *node, GString *str, gboolean full, void *data) { +blist_drawing_tooltip_cb(PurpleBListNode *node, GString *str, gboolean full, void *data) { purple_debug_info("gtk-signal-test", "drawing tooltip cb\n"); }
--- a/pidgin/plugins/gtkbuddynote.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/plugins/gtkbuddynote.c Wed Jul 03 22:18:55 2013 +0530 @@ -25,7 +25,7 @@ #include <version.h> static void -append_to_tooltip(PurpleBlistNode *node, GString *text, gboolean full) +append_to_tooltip(PurpleBListNode *node, GString *text, gboolean full) { if (full) { const gchar *note = purple_blist_node_get_string(node, "notes");
--- a/pidgin/plugins/history.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/plugins/history.c Wed Jul 03 22:18:55 2013 +0530 @@ -75,14 +75,14 @@ for (cur = buddies; cur != NULL; cur = cur->next) { - PurpleBlistNode *node = cur->data; - PurpleBlistNode *prev = purple_blist_node_get_sibling_prev(node); - PurpleBlistNode *next = purple_blist_node_get_sibling_next(node); + PurpleBListNode *node = cur->data; + PurpleBListNode *prev = purple_blist_node_get_sibling_prev(node); + PurpleBListNode *next = purple_blist_node_get_sibling_next(node); if ((node != NULL) && ((prev != NULL) || (next != NULL))) { - PurpleBlistNode *node2; - PurpleBlistNode *parent = purple_blist_node_get_parent(node); - PurpleBlistNode *child = purple_blist_node_get_first_child(parent); + PurpleBListNode *node2; + PurpleBListNode *parent = purple_blist_node_get_parent(node); + PurpleBListNode *child = purple_blist_node_get_first_child(parent); alias = purple_buddy_get_contact_alias((PurpleBuddy *)node);
--- a/pidgin/plugins/ticker/ticker.c Wed Jul 03 22:13:33 2013 +0530 +++ b/pidgin/plugins/ticker/ticker.c Wed Jul 03 22:18:55 2013 +0530 @@ -227,7 +227,7 @@ static void buddy_ticker_show(void) { - PurpleBlistNode *gnode, *cnode, *bnode; + PurpleBListNode *gnode, *cnode, *bnode; PurpleBuddy *b; for(gnode = purple_blist_get_root();
