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

diff --git a/libempathy-gtk/empathy-individual-menu.h b/libempathy-gtk/empathy-individual-menu.h
index 31acc156ee9f5314d9889646effe2257f9c6bedc..d5bced1b21b20d918d2d4d5f8d137cdeb587d91f 100644 (file)
--- 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 00506dafee8bb93c65249f946ba530ed87ae2061..87dd20c7623fd2caddb5b90fd8e3b7172ee96576 100644 (file)
--- 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 2f73acf92dcb8b235b6076f7f5c814eaee4f096a..20bd607398afd3ff8cce6b52a128673bffbfb136 100644 (file)
--- 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),