diff options
author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-06-21 17:33:42 +0800 |
---|---|---|
committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-06-21 17:33:42 +0800 |
commit | 44b337df1962dbcda7b8de161444735570d38972 (patch) | |
tree | f4d960b0ef300a24e8b79b1cb84418de5f598184 /libempathy-gtk/empathy-contact-menu.c | |
parent | 783c15aecdb7aba0ef69c4a82dae0f391007185e (diff) | |
parent | 733ae445e0f0c79b13de25e408957f23ed9a53a9 (diff) | |
download | gsoc2013-empathy-44b337df1962dbcda7b8de161444735570d38972.tar gsoc2013-empathy-44b337df1962dbcda7b8de161444735570d38972.tar.gz gsoc2013-empathy-44b337df1962dbcda7b8de161444735570d38972.tar.bz2 gsoc2013-empathy-44b337df1962dbcda7b8de161444735570d38972.tar.lz gsoc2013-empathy-44b337df1962dbcda7b8de161444735570d38972.tar.xz gsoc2013-empathy-44b337df1962dbcda7b8de161444735570d38972.tar.zst gsoc2013-empathy-44b337df1962dbcda7b8de161444735570d38972.zip |
Merge remote branch 'sjoerd/misc'
Diffstat (limited to 'libempathy-gtk/empathy-contact-menu.c')
-rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 9ea19af32..9b49389c1 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -131,14 +131,12 @@ empathy_contact_menu_new (EmpathyContact *contact, gtk_widget_show (item); } -#if HAVE_FAVOURITE_CONTACTS /* Favorite checkbox */ 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; } @@ -392,7 +390,6 @@ empathy_contact_share_my_desktop_menu_item_new (EmpathyContact *contact) return item; } -#if HAVE_FAVOURITE_CONTACTS static void favourite_menu_item_toggled_cb (GtkCheckMenuItem *item, EmpathyContact *contact) @@ -432,7 +429,6 @@ empathy_contact_favourite_menu_item_new (EmpathyContact *contact) g_object_unref (manager); return item; } -#endif static void contact_info_menu_item_activate_cb (EmpathyContact *contact) |