# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1225483475 0
# Node ID d93c93dfa4354924c1e701d7feaf50a2b2590771
# Parent  8d562557ed6fa9524e146837184b41232545ef89# Parent  178efff390414aedb1c10a20c6d691f96c8c90ee
merge of 'af834be8e1d99f849b1cade9138e197d7ddf362a'
     and 'eb6bef6c2bad87bebbd163d3db3e7c9512216a4b'

diff -r 8d562557ed6f -r d93c93dfa435 ChangeLog.API
--- a/ChangeLog.API	Fri Oct 31 10:14:23 2008 +0000
+++ b/ChangeLog.API	Fri Oct 31 20:04:35 2008 +0000
@@ -8,6 +8,9 @@
 		* purple_connection_get_protocol_data
 		* purple_connection_set_protocol_data
 
+		Deprecated:
+		* purple_buddy_get_local_alias
+
 version 2.5.0 (08/18/2008):
 	libpurple:
 		Added:
diff -r 8d562557ed6f -r d93c93dfa435 libpurple/blist.h
--- a/libpurple/blist.h	Fri Oct 31 10:14:23 2008 +0000
+++ b/libpurple/blist.h	Fri Oct 31 20:04:35 2008 +0000
@@ -685,6 +685,7 @@
  */
 const char *purple_buddy_get_contact_alias(PurpleBuddy *buddy);
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BLIST_C_)
 /**
  * Returns the correct alias for this user, ignoring server aliases.  Used
  * when a user-recognizable name is required.  In order: buddy's alias; buddy's
@@ -692,8 +693,10 @@
  * 
  * @param buddy  The buddy whose alias will be returned.
  * @return       The appropriate name or alias.
+ * @deprecated   Try purple_buddy_get_alias(), if server aliases are okay.
  */
 const char *purple_buddy_get_local_alias(PurpleBuddy *buddy);
+#endif
 
 /**
  * Returns the correct name to display for a buddy. In order of precedence:
diff -r 8d562557ed6f -r d93c93dfa435 libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c	Fri Oct 31 10:14:23 2008 +0000
+++ b/libpurple/protocols/gg/gg.c	Fri Oct 31 20:04:35 2008 +0000
@@ -1907,7 +1907,7 @@
 {
 	PurpleAccount *account;
 	GGPInfo *info = gc->proto_data;
-	const char *name = purple_buddy_get_name(buddy);
+	const gchar *name = purple_buddy_get_name(buddy);
 
 	gg_add_notify(info->session, ggp_str_to_uin(name));