[empathy] remove EMPATHY_INDIVIDUAL_FEATURE_ALL

[Guillaume Desmottes <gdesmott src gnome org>]

commit d1aa75b0da95e14969ca72c23b07fd7177d1a0ad
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Dec 1 14:37:08 2011 +0100

    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

 libempathy-gtk/empathy-individual-menu.h |    1 -
 libempathy-gtk/empathy-individual-view.h |    1 -
 src/empathy-main-window.c                |   21 +++++++++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-menu.h b/libempathy-gtk/empathy-individual-menu.h
index 31acc15..d5bced1 100644
--- a/libempathy-gtk/empathy-individual-menu.h
+++ b/libempathy-gtk/empathy-individual-menu.h
@@ -41,7 +41,6 @@ typedef enum {
 	EMPATHY_INDIVIDUAL_FEATURE_SMS = 1 << 7,
 	EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE = 1 << 8,
 	EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT = 1 << 9,
-	EMPATHY_INDIVIDUAL_FEATURE_ALL = (1 << 10) - 1,
 } EmpathyIndividualFeatureFlags;
 
 #define EMPATHY_TYPE_INDIVIDUAL_MENU (empathy_individual_menu_get_type ())
diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h
index 00506da..87dd20c 100644
--- a/libempathy-gtk/empathy-individual-view.h
+++ b/libempathy-gtk/empathy-individual-view.h
@@ -63,7 +63,6 @@ typedef enum
   EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_CALL = 1 << 8,
   EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP = 1 << 9,
   EMPATHY_INDIVIDUAL_VIEW_FEATURE_FILE_DROP = 1 << 10,
-  EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL = (1 << 11) - 1,
 } EmpathyIndividualViewFeatureFlags;
 
 struct _EmpathyIndividualView
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 2f73acf..20bd607 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),