From d1aa75b0da95e14969ca72c23b07fd7177d1a0ad Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 1 Dec 2011 14:37:08 +0100 Subject: remove EMPATHY_INDIVIDUAL_FEATURE_ALL It's a bit fragile, user should say which features he wants. https://bugzilla.gnome.org/show_bug.cgi?id=665038 --- src/empathy-main-window.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 2f73acf92..20bd60739 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -2471,8 +2471,25 @@ empathy_main_window_init (EmpathyMainWindow *window) * drop, so allowing them would achieve nothing except confusion. */ priv->individual_view = empathy_individual_view_new ( priv->individual_store, - EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL ^ EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP, - EMPATHY_INDIVIDUAL_FEATURE_ALL ^ EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT); + /* EmpathyIndividualViewFeatureFlags */ + EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_SAVE | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_RENAME | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_REMOVE | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_CHANGE | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_REMOVE | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DROP | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DRAG | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_TOOLTIP | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_CALL | + EMPATHY_INDIVIDUAL_VIEW_FEATURE_FILE_DROP, + /* EmpathyIndividualFeatureFlags */ + EMPATHY_INDIVIDUAL_FEATURE_CHAT | + EMPATHY_INDIVIDUAL_FEATURE_CALL | + EMPATHY_INDIVIDUAL_FEATURE_EDIT | + EMPATHY_INDIVIDUAL_FEATURE_INFO | + EMPATHY_INDIVIDUAL_FEATURE_LINK | + EMPATHY_INDIVIDUAL_FEATURE_SMS | + EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE); gtk_widget_show (GTK_WIDGET (priv->individual_view)); gtk_container_add (GTK_CONTAINER (sw), -- cgit v1.2.3