diff options
author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-03-30 18:37:25 +0800 |
---|---|---|
committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-03-30 18:37:25 +0800 |
commit | 940d0e9778828657a6ffbcadd35a8a84d706ac70 (patch) | |
tree | b163e0eea34c115edbd5e72eb56de944352721e7 /libempathy-gtk/empathy-contact-list-view.c | |
parent | e7f70475f0533c310995a9dc3b2f5ee1eb58b618 (diff) | |
parent | fff76809babe6a154cd548e9bc3aa43199e9eda9 (diff) | |
download | gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.gz gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.bz2 gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.lz gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.xz gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.zst gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.zip |
Merge branch 'people-nearby-fake-group-613558'
Diffstat (limited to 'libempathy-gtk/empathy-contact-list-view.c')
-rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 9d85ecb87..05823435a 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -942,11 +942,14 @@ contact_list_view_group_icon_cell_data_func (GtkTreeViewColumn *tree_column, if (!is_group) goto out; - if (tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_FAVORITE)) - goto out; - - pixbuf = empathy_pixbuf_from_icon_name ("emblem-favorite", - GTK_ICON_SIZE_MENU); + if (!tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_FAVORITE)) { + pixbuf = empathy_pixbuf_from_icon_name ("emblem-favorite", + GTK_ICON_SIZE_MENU); + } + else if (!tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_PEOPLE_NEARBY)) { + pixbuf = empathy_pixbuf_from_icon_name ("im-local-xmpp", + GTK_ICON_SIZE_MENU); + } out: g_object_set (cell, |