diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2010-03-27 04:09:45 +0800 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2010-03-30 18:30:19 +0800 |
| commit | 802baeadd5caf73b813462791b29d052a7134cd6 (patch) | |
| tree | 974b41c58d781c8f1101b442befb656d69297393 /libempathy-gtk/empathy-contact-list-store.c | |
| parent | e0535b86ebb7a0d5908597ecb82a7754c31a6076 (diff) | |
| download | gsoc2013-empathy-802baeadd5caf73b813462791b29d052a7134cd6.tar gsoc2013-empathy-802baeadd5caf73b813462791b29d052a7134cd6.tar.gz gsoc2013-empathy-802baeadd5caf73b813462791b29d052a7134cd6.tar.bz2 gsoc2013-empathy-802baeadd5caf73b813462791b29d052a7134cd6.tar.lz gsoc2013-empathy-802baeadd5caf73b813462791b29d052a7134cd6.tar.xz gsoc2013-empathy-802baeadd5caf73b813462791b29d052a7134cd6.tar.zst gsoc2013-empathy-802baeadd5caf73b813462791b29d052a7134cd6.zip | |
Show status messages in compact view (#614052)
Previously, when the contact list was in compact mode your contacts'
status mesasges were not shown. With this patch, status messages are
shown in the space to the right of the contact's name, in the same
small, grey font as in the expanded view.
Only custom messages are shown; fallback strings like _("Available") are
redundant and made the list way too hard to read, so are not shown.
This patch does show that most of my contacts are too boring to have
status messages...
Diffstat (limited to 'libempathy-gtk/empathy-contact-list-store.c')
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-store.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c index 9feb4461f..7ff41d69a 100644 --- a/libempathy-gtk/empathy-contact-list-store.c +++ b/libempathy-gtk/empathy-contact-list-store.c @@ -833,8 +833,9 @@ contact_list_store_setup (EmpathyContactListStore *store) GDK_TYPE_PIXBUF, /* Avatar pixbuf */ G_TYPE_BOOLEAN, /* Avatar pixbuf visible */ G_TYPE_STRING, /* Name */ + G_TYPE_UINT, /* Presence type */ G_TYPE_STRING, /* Status string */ - G_TYPE_BOOLEAN, /* Show status */ + G_TYPE_BOOLEAN, /* Compact view */ EMPATHY_TYPE_CONTACT, /* Contact type */ G_TYPE_BOOLEAN, /* Is group */ G_TYPE_BOOLEAN, /* Is active */ @@ -1277,8 +1278,11 @@ contact_list_store_contact_update (EmpathyContactListStore *store, EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR, pixbuf_avatar, EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar, EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact), - EMPATHY_CONTACT_LIST_STORE_COL_STATUS, empathy_contact_get_status (contact), - EMPATHY_CONTACT_LIST_STORE_COL_STATUS_VISIBLE, !priv->is_compact, + EMPATHY_CONTACT_LIST_STORE_COL_PRESENCE_TYPE, + empathy_contact_get_presence (contact), + EMPATHY_CONTACT_LIST_STORE_COL_STATUS, + empathy_contact_get_presence_message (contact), + EMPATHY_CONTACT_LIST_STORE_COL_COMPACT, priv->is_compact, EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE, EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE, now_online, EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE, @@ -1751,7 +1755,7 @@ contact_list_store_update_list_mode_foreach (GtkTreeModel *model, gtk_tree_store_set (GTK_TREE_STORE (store), iter, EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, pixbuf_status, EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar, - EMPATHY_CONTACT_LIST_STORE_COL_STATUS_VISIBLE, !priv->is_compact, + EMPATHY_CONTACT_LIST_STORE_COL_COMPACT, priv->is_compact, -1); return FALSE; |