diff options
author | Mathias Hasselmann <hasselmm@src.gnome.org> | 2008-11-14 06:07:56 +0800 |
---|---|---|
committer | Mathias Hasselmann <hasselmm@src.gnome.org> | 2008-11-14 06:07:56 +0800 |
commit | c3bb5a770cda65493dbff7b39cd9015ecc98f265 (patch) | |
tree | 2e1e490af30687a3e592d2d3aadaa62485da4e69 /src | |
parent | d3bb39fc883b0c4d53fe54469f2128456a820371 (diff) | |
download | gsoc2013-empathy-c3bb5a770cda65493dbff7b39cd9015ecc98f265.tar gsoc2013-empathy-c3bb5a770cda65493dbff7b39cd9015ecc98f265.tar.gz gsoc2013-empathy-c3bb5a770cda65493dbff7b39cd9015ecc98f265.tar.bz2 gsoc2013-empathy-c3bb5a770cda65493dbff7b39cd9015ecc98f265.tar.lz gsoc2013-empathy-c3bb5a770cda65493dbff7b39cd9015ecc98f265.tar.xz gsoc2013-empathy-c3bb5a770cda65493dbff7b39cd9015ecc98f265.tar.zst gsoc2013-empathy-c3bb5a770cda65493dbff7b39cd9015ecc98f265.zip |
Include account name in chat-window tooltip. Fixes bug #560622
svn path=/trunk/; revision=1720
Diffstat (limited to 'src')
-rw-r--r-- | src/empathy-chat-window.c | 12 |
1 files changed, 8 insertions, 4 deletions
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 ("<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); } |