empathy r1720 - trunk/src

[hasselmm svn gnome org]

Author: hasselmm
Date: Thu Nov 13 22:07:56 2008
New Revision: 1720
URL: http://svn.gnome.org/viewvc/empathy?rev=1720&view=rev

Log:
Include account name in chat-window tooltip. Fixes bug #560622

Modified:
   trunk/src/empathy-chat-window.c

Modified: trunk/src/empathy-chat-window.c
==============================================================================
--- trunk/src/empathy-chat-window.c	(original)
+++ trunk/src/empathy-chat-window.c	Thu Nov 13 22:07:56 2008
@@ -352,6 +352,7 @@
 	EmpathyChatWindowPriv *priv;
 	EmpathyContact        *remote_contact;
 	const gchar           *name;
+	McAccount             *account;
 	const gchar           *subject;
 	GtkWidget             *widget;
 	GString               *tooltip;
@@ -366,11 +367,12 @@
 
 	/* Get information */
 	name = empathy_chat_get_name (chat);
+	account = empathy_chat_get_account (chat);
 	subject = empathy_chat_get_subject (chat);
 	remote_contact = empathy_chat_get_remote_contact (chat);
 
-	DEBUG ("Updating chat tab, name=%s, subject=%s, remote_contact=%p",
-		name, subject, remote_contact);
+	DEBUG ("Updating chat tab, name=%s, account=%s, subject=%s, remote_contact=%p",
+		name, mc_account_get_unique_name (account), subject, remote_contact);
 
 	/* Update tab image */
 	if (g_list_find (priv->chats_new_msg, chat)) {
@@ -391,14 +393,16 @@
 	tooltip = g_string_new (NULL);
 
 	if (remote_contact) {
-		markup = g_markup_printf_escaped ("<b>%s</b>\n%s",
+		markup = g_markup_printf_escaped ("<b>%s</b><small> (%s)</small>\n%s",
 						  empathy_contact_get_id (remote_contact),
+						  mc_account_get_display_name (account),
 						  empathy_contact_get_status (remote_contact));
 		g_string_append (tooltip, markup);
 		g_free (markup);
 	}
 	else {
-		markup = g_markup_printf_escaped ("<b>%s</b>", name);
+		markup = g_markup_printf_escaped ("<b>%s</b><small>  (%s)</small>", name,
+						  mc_account_get_display_name (account));
 		g_string_append (tooltip, markup);
 		g_free (markup);
 	}