diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-25 16:24:49 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-25 16:24:49 +0800 |
| commit | ed9505140adea2ad3ef0a8d25057197864ead712 (patch) | |
| tree | 2628b0f3c84346bfa51ef253cbaff3144040ad36 /src | |
| parent | 5195f67f8a9fce3da49f875868e288df16df6a52 (diff) | |
| parent | 0a42a790212981b6740b2c93da647c835bddf25d (diff) | |
| download | gsoc2013-empathy-ed9505140adea2ad3ef0a8d25057197864ead712.tar gsoc2013-empathy-ed9505140adea2ad3ef0a8d25057197864ead712.tar.gz gsoc2013-empathy-ed9505140adea2ad3ef0a8d25057197864ead712.tar.bz2 gsoc2013-empathy-ed9505140adea2ad3ef0a8d25057197864ead712.tar.lz gsoc2013-empathy-ed9505140adea2ad3ef0a8d25057197864ead712.tar.xz gsoc2013-empathy-ed9505140adea2ad3ef0a8d25057197864ead712.tar.zst gsoc2013-empathy-ed9505140adea2ad3ef0a8d25057197864ead712.zip | |
Merge remote-tracking branch 'glassrose/make-favorite-room-names-more-detailed-646526'
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-main-window.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 227160985..3f1be88be 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -1607,14 +1607,20 @@ main_window_favorite_chatroom_menu_add (EmpathyMainWindow *window, { EmpathyMainWindowPriv *priv = GET_PRIV (window); GtkWidget *menu_item; - const gchar *name; + const gchar *name, *account_name; + gchar *label; + if (g_object_get_data (G_OBJECT (chatroom), "menu_item")) { return; } name = empathy_chatroom_get_name (chatroom); - menu_item = gtk_menu_item_new_with_label (name); + account_name = tp_account_get_display_name ( + empathy_chatroom_get_account (chatroom)); + label = g_strdup_printf ("%s (%s)", name, account_name); + menu_item = gtk_menu_item_new_with_label (label); + g_free (label); g_object_set_data (G_OBJECT (menu_item), "is_favorite", GUINT_TO_POINTER (TRUE)); |