From c3bb5a770cda65493dbff7b39cd9015ecc98f265 Mon Sep 17 00:00:00 2001 From: Mathias Hasselmann Date: Thu, 13 Nov 2008 22:07:56 +0000 Subject: Include account name in chat-window tooltip. Fixes bug #560622 svn path=/trunk/; revision=1720 --- src/empathy-chat-window.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 98a266141..255c5d679 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -352,6 +352,7 @@ chat_window_update_chat_tab (EmpathyChat *chat) EmpathyChatWindowPriv *priv; EmpathyContact *remote_contact; const gchar *name; + McAccount *account; const gchar *subject; GtkWidget *widget; GString *tooltip; @@ -366,11 +367,12 @@ chat_window_update_chat_tab (EmpathyChat *chat) /* 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 @@ chat_window_update_chat_tab (EmpathyChat *chat) tooltip = g_string_new (NULL); if (remote_contact) { - markup = g_markup_printf_escaped ("%s\n%s", + markup = g_markup_printf_escaped ("%s (%s)\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 ("%s", name); + markup = g_markup_printf_escaped ("%s (%s)", name, + mc_account_get_display_name (account)); g_string_append (tooltip, markup); g_free (markup); } -- cgit v1.2.3