aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2010-04-01 11:28:37 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2010-04-01 11:28:37 +0800
commitc36eb1e8df169da9691acf730a9cd1996aed5d76 (patch)
tree84c9aba6e07b6da2b5a97fa98ea13c47e9bf3b2b /libempathy-gtk
parent149dcf3ffc77f9ce8e94aed00f0ee11505f640d3 (diff)
downloadgsoc2013-empathy-c36eb1e8df169da9691acf730a9cd1996aed5d76.tar
gsoc2013-empathy-c36eb1e8df169da9691acf730a9cd1996aed5d76.tar.gz
gsoc2013-empathy-c36eb1e8df169da9691acf730a9cd1996aed5d76.tar.bz2
gsoc2013-empathy-c36eb1e8df169da9691acf730a9cd1996aed5d76.tar.lz
gsoc2013-empathy-c36eb1e8df169da9691acf730a9cd1996aed5d76.tar.xz
gsoc2013-empathy-c36eb1e8df169da9691acf730a9cd1996aed5d76.tar.zst
gsoc2013-empathy-c36eb1e8df169da9691acf730a9cd1996aed5d76.zip
Make 'Favourite' only appear when EMPATHY_CONTACT_FEATURE_FAVOURITE set
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-contact-menu.c11
-rw-r--r--libempathy-gtk/empathy-contact-menu.h3
2 files changed, 9 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 23522d40e..fbcd8dc8a 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -114,7 +114,8 @@ empathy_contact_menu_new (EmpathyContact *contact,
/* Separator */
if (features & (EMPATHY_CONTACT_FEATURE_EDIT |
- EMPATHY_CONTACT_FEATURE_INFO)) {
+ EMPATHY_CONTACT_FEATURE_INFO |
+ EMPATHY_CONTACT_FEATURE_FAVOURITE)) {
item = gtk_separator_menu_item_new ();
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
@@ -136,9 +137,11 @@ empathy_contact_menu_new (EmpathyContact *contact,
#if HAVE_FAVOURITE_CONTACTS
/* Favorite checkbox */
- item = empathy_contact_favourite_menu_item_new (contact);
- gtk_menu_shell_append (shell, item);
- gtk_widget_show (item);
+ if (features & EMPATHY_CONTACT_FEATURE_FAVOURITE) {
+ item = empathy_contact_favourite_menu_item_new (contact);
+ gtk_menu_shell_append (shell, item);
+ gtk_widget_show (item);
+ }
#endif
return menu;
diff --git a/libempathy-gtk/empathy-contact-menu.h b/libempathy-gtk/empathy-contact-menu.h
index 25f18e03f..4c6d62f9d 100644
--- a/libempathy-gtk/empathy-contact-menu.h
+++ b/libempathy-gtk/empathy-contact-menu.h
@@ -35,7 +35,8 @@ typedef enum {
EMPATHY_CONTACT_FEATURE_LOG = 1 << 2,
EMPATHY_CONTACT_FEATURE_EDIT = 1 << 3,
EMPATHY_CONTACT_FEATURE_INFO = 1 << 4,
- EMPATHY_CONTACT_FEATURE_ALL = (1 << 5) - 1,
+ EMPATHY_CONTACT_FEATURE_FAVOURITE = 1 << 5,
+ EMPATHY_CONTACT_FEATURE_ALL = (1 << 6) - 1,
} EmpathyContactFeatureFlags;
GtkWidget * empathy_contact_menu_new (EmpathyContact *contact,