/soc/2013/ankitkv/gobjectification: 09b2c9219b57: Renamed Purple...

Ankit Vani a at nevitus.org
Wed Jul 3 12:49:08 EDT 2013


Changeset: 09b2c9219b5768e93c20c4d24f640f3793fe792b
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-07-03 22:18 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/09b2c9219b57

Description:

Renamed PurpleBlistNode to PurpleBListNode

diffstat:

 finch/gntblist.c                           |  206 +++++++++---------
 finch/gntblist.h                           |    6 +-
 finch/gntconv.c                            |   22 +-
 finch/gntlog.c                             |    6 +-
 finch/gntpounce.c                          |    2 +-
 finch/gntrequest.c                         |    4 +-
 finch/plugins/gnthistory.c                 |    4 +-
 finch/plugins/grouping.c                   |   30 +-
 libpurple/account.h                        |    2 +-
 libpurple/accounts.c                       |    6 +-
 libpurple/blist.c                          |  312 ++++++++++++++--------------
 libpurple/blist.h                          |  106 ++++----
 libpurple/buddyicon.c                      |   46 ++--
 libpurple/buddyicon.h                      |    8 +-
 libpurple/dbus-define-api.h                |   12 +-
 libpurple/dbus-server.c                    |    8 +-
 libpurple/log.c                            |    2 +-
 libpurple/plugins/autoaccept.c             |    8 +-
 libpurple/plugins/buddynote.c              |    8 +-
 libpurple/plugins/log_reader.c             |    4 +-
 libpurple/plugins/perl/common/module.h     |    2 +-
 libpurple/plugins/signals-test.c           |    8 +-
 libpurple/plugins/tcl/tcl_cmds.c           |    6 +-
 libpurple/plugins/tcl/tcl_signals.c        |    6 +-
 libpurple/protocols/bonjour/bonjour.c      |    4 +-
 libpurple/protocols/gg/gg.c                |    4 +-
 libpurple/protocols/gg/purplew.c           |    4 +-
 libpurple/protocols/jabber/adhoccommands.c |    2 +-
 libpurple/protocols/jabber/adhoccommands.h |    2 +-
 libpurple/protocols/jabber/buddy.c         |   18 +-
 libpurple/protocols/jabber/buddy.h         |    2 +-
 libpurple/protocols/jabber/google/google.c |    2 +-
 libpurple/protocols/jabber/google/google.h |    2 +-
 libpurple/protocols/jabber/jabber.c        |    2 +-
 libpurple/protocols/jabber/roster.c        |    2 +-
 libpurple/protocols/msn/msn.c              |    6 +-
 libpurple/protocols/mxit/mxit.c            |    4 +-
 libpurple/protocols/myspace/user.c         |    2 +-
 libpurple/protocols/myspace/zap.c          |    4 +-
 libpurple/protocols/myspace/zap.h          |    2 +-
 libpurple/protocols/novell/novell.c        |   10 +-
 libpurple/protocols/null/nullprpl.c        |    4 +-
 libpurple/protocols/oscar/authorization.c  |    2 +-
 libpurple/protocols/oscar/family_icq.c     |    2 +-
 libpurple/protocols/oscar/oscar.c          |   16 +-
 libpurple/protocols/oscar/oscar.h          |    2 +-
 libpurple/protocols/oscar/oscarcommon.h    |    2 +-
 libpurple/protocols/oscar/visibility.c     |    2 +-
 libpurple/protocols/sametime/sametime.c    |   56 ++--
 libpurple/protocols/silc/buddy.c           |   28 +-
 libpurple/protocols/silc/chat.c            |   44 ++--
 libpurple/protocols/silc/silc.c            |    2 +-
 libpurple/protocols/yahoo/libymsg.c        |   16 +-
 libpurple/protocols/yahoo/libymsg.h        |    2 +-
 libpurple/protocols/zephyr/zephyr.c        |    2 +-
 libpurple/prpl.h                           |    2 +-
 libpurple/status.c                         |    2 +-
 pidgin/gtkblist.c                          |  254 +++++++++++-----------
 pidgin/gtkblist.h                          |   26 +-
 pidgin/gtkconv.c                           |   80 +++---
 pidgin/gtkdialogs.c                        |   10 +-
 pidgin/gtklog.c                            |    4 +-
 pidgin/gtkpounce.c                         |    2 +-
 pidgin/gtkutils.c                          |    4 +-
 pidgin/plugins/cap/cap.c                   |    2 +-
 pidgin/plugins/cap/cap.h                   |    2 +-
 pidgin/plugins/gevolution/gevo-util.c      |    2 +-
 pidgin/plugins/gevolution/gevolution.c     |    6 +-
 pidgin/plugins/gtk-signals-test.c          |    2 +-
 pidgin/plugins/gtkbuddynote.c              |    2 +-
 pidgin/plugins/history.c                   |   12 +-
 pidgin/plugins/ticker/ticker.c             |    2 +-
 72 files changed, 745 insertions(+), 745 deletions(-)

diffs (truncated from 5817 to 300 lines):

diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -72,11 +72,11 @@ typedef struct
 	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_buddy(PurpleBuddy *buddy
 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 draw_tooltip(FinchBlist *ggb
 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 @@ static int color_idle;
  * 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 @@ static gboolean default_can_add_node(Pur
 		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 @@ static gboolean default_can_add_node(Pur
 		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 @@ static gboolean default_can_add_node(Pur
 	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 gpointer default_find_parent(Purp
 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 @@ static gboolean default_create_tooltip(g
 				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 FinchBlistManager default_manager
 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 @@ create_finch_blist_node(PurpleBlistNode 
 }
 
 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 @@ reset_blist_node_ui_data(PurpleBlistNode
 }
 
 static int
-get_display_color(PurpleBlistNode  *node)
+get_display_color(PurpleBListNode  *node)
 {
 	PurpleBuddy *buddy;
 	int color = 0;
@@ -378,7 +378,7 @@ get_display_color(PurpleBlistNode  *node
 }
 
 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 @@ get_blist_node_flag(PurpleBlistNode *nod
 		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 @@ get_blist_node_flag(PurpleBlistNode *nod
 }
 
 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 @@ blist_update_row_flags(PurpleBlistNode *
 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 @@ is_contact_online(PurpleContact *contact
 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 @@ is_group_online(PurpleGroup *group)
 #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 @@ add_node(PurpleBlistNode *node, FinchBli
 	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 @@ remove_tooltip(FinchBlist *ggblist)
 }
 
 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 @@ node_remove(PurpleBuddyList *list, Purpl
 }
 
 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 @@ node_update(PurpleBuddyList *list, Purpl
 
 	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 @@ remove_new_empty_group(gpointer data)
 
 	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 @@ add_chat_cb(void *data, PurpleRequestFie
 		}
 		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 @@ add_group_cb(gpointer null, const char *
 
 	/* 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 @@ static void
 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 @@ add_group(PurpleGroup *group, FinchBlist
 }
 
 static const char *
-get_display_name(PurpleBlistNode *node)
+get_display_name(PurpleBListNode *node)
 {
 	static char text[2096];
 	char status[8] = " ";
@@ -958,13 +958,13 @@ static void
 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;



More information about the Commits mailing list