Mercurial > pidgin.yaz

diff libpurple/conversation.c @ 32707:f75041cb3fec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert libpurple and protocol prpl's to use the purple_account_* accessor functions.
author andrew.victor@mxit.com
date Sat, 01 Oct 2011 18:21:43 +0000
parents 588f9b808a31
children 10e5000326a5
line wrap: on
line diff
--- a/libpurple/conversation.c	Sat Oct 01 17:10:45 2011 +0000
+++ b/libpurple/conversation.c	Sat Oct 01 18:21:43 2011 +0000
@@ -372,7 +372,7 @@
 		if (gc)
 			me = purple_connection_get_display_name(gc);
 		if (!me)
-			me = conv->account->username;
+			me = purple_account_get_username(conv->account);
 		who = me;
 	}
 
@@ -1100,7 +1100,7 @@
 							purple_account_get_username(account));
 
 				if (purple_account_get_alias(account) != NULL)
-					alias = account->alias;
+					alias = purple_account_get_alias(account);
 				else if (b != NULL && !purple_strequal(purple_buddy_get_name(b), purple_buddy_get_contact_alias(b)))
 					alias = purple_buddy_get_contact_alias(b);
 				else if (purple_connection_get_display_name(gc) != NULL)