diff options
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-contact-list-store.c | 2 | ||||
-rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 4 | ||||
-rw-r--r-- | libempathy-gtk/empathy-contact-widget.c | 8 |
3 files changed, 0 insertions, 14 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c index 98cd81b5d..d5969c87b 100644 --- a/libempathy-gtk/empathy-contact-list-store.c +++ b/libempathy-gtk/empathy-contact-list-store.c @@ -1061,7 +1061,6 @@ contact_list_store_add_contact (EmpathyContactListStore *store, } g_list_free (groups); -#ifdef HAVE_FAVOURITE_CONTACTS if (priv->show_groups && empathy_contact_list_is_favourite (priv->list, contact)) { /* Add contact to the fake 'Favorites' group */ @@ -1072,7 +1071,6 @@ contact_list_store_add_contact (EmpathyContactListStore *store, add_contact_to_store (GTK_TREE_STORE (store), &iter, &iter_group, contact, flags); } -#endif contact_list_store_contact_update (store, contact); } 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) diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 72fe321d7..e7a6b3a14 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -1405,7 +1405,6 @@ contact_widget_presence_notify_cb (EmpathyContactWidget *information) gtk_widget_show (information->image_state); } -#if HAVE_FAVOURITE_CONTACTS static void contact_widget_favourites_changed_cb (EmpathyContactManager *manager, EmpathyContact *contact, @@ -1418,7 +1417,6 @@ contact_widget_favourites_changed_cb (EmpathyContactManager *manager, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON ( information->favourite_checkbox), is_favourite); } -#endif static void contact_widget_remove_contact (EmpathyContactWidget *information) @@ -1524,7 +1522,6 @@ contact_widget_contact_update (EmpathyContactWidget *information) contact_widget_presence_notify_cb (information); contact_widget_avatar_notify_cb (information); -#if HAVE_FAVOURITE_CONTACTS if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE) { gboolean is_favourite; @@ -1536,7 +1533,6 @@ contact_widget_contact_update (EmpathyContactWidget *information) contact_widget_favourites_changed_cb (information->manager, information->contact, is_favourite, information); } -#endif gtk_widget_show (information->label_alias); gtk_widget_show (information->widget_alias); @@ -1657,7 +1653,6 @@ contact_widget_id_focus_out_cb (GtkWidget *widget, return FALSE; } -#if HAVE_FAVOURITE_CONTACTS static void favourite_toggled_cb (GtkToggleButton *button, EmpathyContactWidget *information) @@ -1677,7 +1672,6 @@ favourite_toggled_cb (GtkToggleButton *button, EMPATHY_CONTACT_LIST (information->manager), information->contact); } } -#endif static void contact_widget_contact_setup (EmpathyContactWidget *information) @@ -1817,7 +1811,6 @@ contact_widget_contact_setup (EmpathyContactWidget *information) } gtk_widget_show (information->widget_alias); -#if HAVE_FAVOURITE_CONTACTS /* Favorite */ if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE) { @@ -1836,7 +1829,6 @@ contact_widget_contact_setup (EmpathyContactWidget *information) gtk_widget_show (information->favourite_checkbox); } -#endif } static void |