aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-12-01 21:37:08 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-12-14 20:24:04 +0800
commitd1aa75b0da95e14969ca72c23b07fd7177d1a0ad (patch)
treef2c95ff4a8acf95eb931ad78df43b28aeaf5d37f /src
parent27de0b98c6433d56b7dd4112817c49a1bca7ddce (diff)
downloadgsoc2013-empathy-d1aa75b0da95e14969ca72c23b07fd7177d1a0ad.tar
gsoc2013-empathy-d1aa75b0da95e14969ca72c23b07fd7177d1a0ad.tar.gz
gsoc2013-empathy-d1aa75b0da95e14969ca72c23b07fd7177d1a0ad.tar.bz2
gsoc2013-empathy-d1aa75b0da95e14969ca72c23b07fd7177d1a0ad.tar.lz
gsoc2013-empathy-d1aa75b0da95e14969ca72c23b07fd7177d1a0ad.tar.xz
gsoc2013-empathy-d1aa75b0da95e14969ca72c23b07fd7177d1a0ad.tar.zst
gsoc2013-empathy-d1aa75b0da95e14969ca72c23b07fd7177d1a0ad.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/empathy-main-window.c21
1 files changed, 19 insertions, 2 deletions
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),