Mercurial > pidgin.yaz

diff libpurple/conversation.c @ 25299:5ebfa814b9e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Finish off the libpurple updates for the hidden blist structs
author Gary Kramlich <grim@reaperworld.com>
date Sun, 02 Nov 2008 10:54:00 +0000
parents abf8ebd4c9e1
children a6e3cb32cdd2
line wrap: on
line diff
--- a/libpurple/conversation.c	Sun Nov 02 10:21:19 2008 +0000
+++ b/libpurple/conversation.c	Sun Nov 02 10:54:00 2008 +0000
@@ -665,7 +665,7 @@
 			text = purple_buddy_get_contact_alias(b);
 	} else if(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 		if(account && ((chat = purple_blist_find_chat(account, name)) != NULL))
-			text = chat->alias;
+			text = purple_chat_get_name(chat);
 	}
 
 
@@ -912,7 +912,7 @@
 
 				if (purple_account_get_alias(account) != NULL)
 					alias = account->alias;
-				else if (b != NULL && strcmp(b->name, purple_buddy_get_contact_alias(b)))
+				else if (b != NULL && strcmp(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)
 					alias = purple_connection_get_display_name(gc);