# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1154165983 0
# Node ID d9fab56e6011d7095d29d90a1d95864f8ddf50f8
# Parent  9653b21bde9ea63d2cbe3901d8b39036a298f72d
[gaim-migrate @ 16594]
Enhancement patch from wabz (Richard Nelson) to show the title of the
conversation, and to show the alias of the buddy in the conversation if set.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9653b21bde9e -r d9fab56e6011 console/gntconv.c
--- a/console/gntconv.c	Fri Jul 28 23:48:26 2006 +0000
+++ b/console/gntconv.c	Sat Jul 29 09:39:43 2006 +0000
@@ -162,7 +162,7 @@
 	conv->ui_data = ggc;
 
 	type = gaim_conversation_get_type(conv);
-	title = g_strdup_printf(_("%s"), gaim_conversation_get_name(conv));
+	title = g_strdup_printf(_("%s"), gaim_conversation_get_title(conv));
 	ggc->window = gnt_box_new(FALSE, TRUE);
 	gnt_box_set_title(GNT_BOX(ggc->window), title);
 	gnt_box_set_toplevel(GNT_BOX(ggc->window), TRUE);
@@ -244,9 +244,9 @@
 gg_write_im(GaimConversation *conv, const char *who, const char *message,
 		GaimMessageFlags flags, time_t mtime)
 {
+	GaimAccount *account = gaim_conversation_get_account(conv);
 	if (flags & GAIM_MESSAGE_SEND)
 	{
-		GaimAccount *account = gaim_conversation_get_account(conv);
 		who = gaim_connection_get_display_name(gaim_account_get_connection(account));
 		if (!who)
 			who = gaim_account_get_alias(account);
@@ -254,7 +254,13 @@
 			who = gaim_account_get_username(account);
 	}
 	else if (flags & GAIM_MESSAGE_RECV)
+	{
+		GaimBuddy *buddy;
 		who = gaim_conversation_get_name(conv);
+		buddy = gaim_find_buddy(account, who);
+		if (buddy)
+			who = gaim_buddy_get_contact_alias(buddy);
+	}
 
 	gg_write_common(conv, who, message, flags, mtime);
 }