/soc/2013/ankitkv/gobjectification: b3e588adef5a: Global replace...

Ankit Vani a at nevitus.org
Sun Jul 7 16:37:35 EDT 2013


Changeset: b3e588adef5ad13b530015e063f8a3629c90fe08
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-07-08 02:07 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/b3e588adef5a

Description:

Global replace purple_buddy_get_local_buddy_alias() with purple_buddy_get_local_alias()

diffstat:

 libpurple/protocols/jabber/google/google_roster.c |   4 ++--
 libpurple/protocols/jabber/roster.c               |   4 ++--
 libpurple/protocols/msn/msn.c                     |   2 +-
 libpurple/protocols/novell/novell.c               |   2 +-
 libpurple/protocols/oscar/oscar.c                 |   2 +-
 libpurple/protocols/sametime/sametime.c           |   2 +-
 libpurple/protocols/yahoo/yahoo_profile.c         |   2 +-
 libpurple/protocols/zephyr/zephyr.c               |   4 ++--
 libpurple/server.c                                |   4 ++--
 pidgin/gtkblist.c                                 |  14 +++++++-------
 pidgin/gtkdialogs.c                               |   2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diffs (202 lines):

diff --git a/libpurple/protocols/jabber/google/google_roster.c b/libpurple/protocols/jabber/google/google_roster.c
--- a/libpurple/protocols/jabber/google/google_roster.c
+++ b/libpurple/protocols/jabber/google/google_roster.c
@@ -132,7 +132,7 @@ void jabber_google_roster_add_deny(Jabbe
 		buddies = g_slist_delete_link(buddies, buddies);
 	} while (buddies);
 
-	balias = purple_buddy_get_local_buddy_alias(b);
+	balias = purple_buddy_get_local_alias(b);
 	xmlnode_set_attrib(item, "jid", who);
 	xmlnode_set_attrib(item, "name", balias ? balias : "");
 	xmlnode_set_attrib(item, "gr:t", "B");
@@ -190,7 +190,7 @@ void jabber_google_roster_rem_deny(Jabbe
 		buddies = g_slist_delete_link(buddies, buddies);
 	} while (buddies);
 
-	balias = purple_buddy_get_local_buddy_alias(b);
+	balias = purple_buddy_get_local_alias(b);
 	xmlnode_set_attrib(item, "jid", who);
 	xmlnode_set_attrib(item, "name", balias ? balias : "");
 	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -146,7 +146,7 @@ static void add_purple_buddy_to_groups(J
 				serv_got_alias(js->gc, jid, servernick);
 
 			/* Alias from our roster retrieval */
-			balias = purple_buddy_get_local_buddy_alias(b);
+			balias = purple_buddy_get_local_alias(b);
 			if(alias && !purple_strequal(alias, balias))
 				purple_serv_got_private_alias(js->gc, jid, alias);
 			g_free(l->data);
@@ -339,7 +339,7 @@ static void jabber_roster_update(JabberS
 
 	xmlnode_set_attrib(item, "jid", name);
 
-	balias = purple_buddy_get_local_buddy_alias(b);
+	balias = purple_buddy_get_local_alias(b);
 	xmlnode_set_attrib(item, "name", balias ? balias : "");
 
 	for(l = groups; l; l = l->next) {
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -2237,7 +2237,7 @@ msn_tooltip_extract_info_text(PurpleNoti
 		char *tmp;
 		const char *alias;
 
-		alias = purple_buddy_get_local_buddy_alias(b);
+		alias = purple_buddy_get_local_alias(b);
 		if (alias && alias[0])
 		{
 			purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), alias);
diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -2705,7 +2705,7 @@ novell_alias_buddy(PurpleConnection * gc
 					const char *balias;
 					buddy = purple_find_buddy_in_group(user->client_data,
 													 name, group);
-					balias = buddy ? purple_buddy_get_local_buddy_alias(buddy) : NULL;
+					balias = buddy ? purple_buddy_get_local_alias(buddy) : NULL;
 					if (balias && strcmp(balias, alias))
 						purple_blist_alias_buddy(buddy, alias);
 				}
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -3893,7 +3893,7 @@ static int purple_ssi_parselist(OscarDat
 
 			/* Store local alias on server */
 			alias = aim_ssi_getalias(&od->ssi.local, gname, bname);
-			balias = purple_buddy_get_local_buddy_alias(b);
+			balias = purple_buddy_get_local_alias(b);
 			if (!alias && balias && *balias)
 				aim_ssi_aliasbuddy(od, gname, bname, balias);
 			g_free(alias);
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -733,7 +733,7 @@ static void blist_export(PurpleConnectio
 
 	  stu = mwSametimeUser_new(stg, utype, &idb);
 	  mwSametimeUser_setShortName(stu, purple_buddy_get_server_alias(bdy));
-	  mwSametimeUser_setAlias(stu, purple_buddy_get_local_buddy_alias(bdy));
+	  mwSametimeUser_setAlias(stu, purple_buddy_get_local_alias(bdy));
 	}
       }
     }
diff --git a/libpurple/protocols/yahoo/yahoo_profile.c b/libpurple/protocols/yahoo/yahoo_profile.c
--- a/libpurple/protocols/yahoo/yahoo_profile.c
+++ b/libpurple/protocols/yahoo/yahoo_profile.c
@@ -700,7 +700,7 @@ static void yahoo_extract_user_info_text
 			info_data->name);
 
 	if (b) {
-		const char *balias = purple_buddy_get_local_buddy_alias(b);
+		const char *balias = purple_buddy_get_local_alias(b);
 		if(balias && balias[0]) {
 			purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias);
 		}
diff --git a/libpurple/protocols/zephyr/zephyr.c b/libpurple/protocols/zephyr/zephyr.c
--- a/libpurple/protocols/zephyr/zephyr.c
+++ b/libpurple/protocols/zephyr/zephyr.c
@@ -793,7 +793,7 @@ static void handle_message(PurpleConnect
 				/* TODO: Check whether it's correct to call add_pair_html,
 				         or if we should be using add_pair_plaintext */
 				purple_notify_user_info_add_pair_html(user_info, _("User"), (b ? bname : user));
-				balias = purple_buddy_get_local_buddy_alias(b);
+				balias = purple_buddy_get_local_alias(b);
 				if (b && balias)
 					purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias);
 
@@ -1179,7 +1179,7 @@ static gint check_notify_tzc(gpointer da
 					         or if we should be using add_pair_plaintext */
 					purple_notify_user_info_add_pair_html(user_info, _("User"), (b ? bname : user));
 
-					balias = b ? purple_buddy_get_local_buddy_alias(b) : NULL;
+					balias = b ? purple_buddy_get_local_alias(b) : NULL;
 					if (balias)
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Alias"), balias);
 
diff --git a/libpurple/server.c b/libpurple/server.c
--- a/libpurple/server.c
+++ b/libpurple/server.c
@@ -225,7 +225,7 @@ void serv_alias_buddy(PurpleBuddy *b)
 				if (prpl_info->alias_buddy)
 					prpl_info->alias_buddy(gc,
 							purple_buddy_get_name(b),
-							purple_buddy_get_local_buddy_alias(b));
+							purple_buddy_get_local_alias(b));
 			}
 		}
 	}
@@ -291,7 +291,7 @@ purple_serv_got_private_alias(PurpleConn
 
 		buddies = g_slist_delete_link(buddies, buddies);
 
-		balias = purple_buddy_get_local_buddy_alias(b);
+		balias = purple_buddy_get_local_alias(b);
 		if (purple_strequal(balias, alias))
 			continue;
 
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -2350,11 +2350,11 @@ static void pidgin_blist_drag_data_get_c
 			protocol,
 			purple_buddy_get_name(buddy));
 
-		if (purple_buddy_get_local_buddy_alias(buddy) != NULL)
+		if (purple_buddy_get_local_alias(buddy) != NULL)
 		{
 			g_string_append_printf(str,
 				"X-IM-Alias: %s\r\n",
-				purple_buddy_get_local_buddy_alias(buddy));
+				purple_buddy_get_local_alias(buddy));
 		}
 
 		g_string_append(str, "\r\n");
@@ -3944,12 +3944,12 @@ static char *pidgin_get_tooltip_text(Pur
 		/* Alias */
 		/* If there's not a contact alias, the node is being displayed with
 		 * this alias, so there's no point in showing it in the tooltip. */
-		if (full && c && purple_buddy_get_local_buddy_alias(b) != NULL && purple_buddy_get_local_buddy_alias(b)[0] != '\0' &&
+		if (full && c && purple_buddy_get_local_alias(b) != NULL && purple_buddy_get_local_alias(b)[0] != '\0' &&
 		    (c->alias != NULL && c->alias[0] != '\0') &&
-		    strcmp(c->alias, purple_buddy_get_local_buddy_alias(b)) != 0)
+		    strcmp(c->alias, purple_buddy_get_local_alias(b)) != 0)
 		{
 			purple_notify_user_info_add_pair_plaintext(user_info,
-					_("Buddy Alias"), purple_buddy_get_local_buddy_alias(b));
+					_("Buddy Alias"), purple_buddy_get_local_alias(b));
 		}
 
 		/* Nickname/Server Alias */
@@ -5867,10 +5867,10 @@ pidgin_blist_search_equal_func(GtkTreeMo
 	compare = NULL;
 	if (PURPLE_IS_CONTACT(node)) {
 		PurpleBuddy *b = purple_contact_get_priority_buddy(PURPLE_CONTACT(node));
-		if (!purple_buddy_get_local_buddy_alias(b))
+		if (!purple_buddy_get_local_alias(b))
 			compare = purple_buddy_get_name(b);
 	} else if (PURPLE_IS_BUDDY(node)) {
-		if (!purple_buddy_get_local_buddy_alias(PURPLE_BUDDY(node)))
+		if (!purple_buddy_get_local_alias(PURPLE_BUDDY(node)))
 			compare = purple_buddy_get_name(PURPLE_BUDDY(node));
 	}
 
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -1198,7 +1198,7 @@ pidgin_dialogs_alias_buddy(PurpleBuddy *
 	secondary = g_strdup_printf(_("Enter an alias for %s."), purple_buddy_get_name(buddy));
 
 	purple_request_input(NULL, _("Alias Buddy"), NULL,
-					   secondary, purple_buddy_get_local_buddy_alias(buddy), FALSE, FALSE, NULL,
+					   secondary, purple_buddy_get_local_alias(buddy), FALSE, FALSE, NULL,
 					   _("Alias"), G_CALLBACK(pidgin_dialogs_alias_buddy_cb),
 					   _("Cancel"), NULL,
 					   purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL,



More information about the Commits mailing list