[gnome-utils] Remove the subfolder tooltips preference

[Paolo Borelli <pborelli src gnome org>]

commit 8760f8dde429f85fe1c27f65a698bc468e42dcea
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Oct 9 18:55:10 2010 +0200

    Remove the subfolder tooltips preference
    
    There is no ui for it and as far as I recall no one ever asked for one.
    Let's just always enable them. One less preference to port to gsettings.
    The code in ringschart is still in place, but if this ever needs to be
    brought back it should become a property.

 baobab/data/baobab.schemas.in  |   14 --------------
 baobab/src/baobab-ringschart.c |    2 +-
 baobab/src/baobab.c            |   19 +------------------
 baobab/src/baobab.h            |    1 -
 4 files changed, 2 insertions(+), 34 deletions(-)
---
diff --git a/baobab/data/baobab.schemas.in b/baobab/data/baobab.schemas.in
index 3ce4f66..2a03676 100644
--- a/baobab/data/baobab.schemas.in
+++ b/baobab/data/baobab.schemas.in
@@ -38,7 +38,6 @@
       </locale>
     </schema>
     
-    
     <schema>
       <key>/schemas/apps/baobab/properties/skip_scan_uri_list</key>
       <applyto>/apps/baobab/properties/skip_scan_uri_list</applyto>
@@ -53,19 +52,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/baobab/ui/baobab_subfoldertips_visible</key>
-      <applyto>/apps/baobab/ui/baobab_subfoldertips_visible</applyto>
-      <owner>baobab</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-	<short>Subfolders tooltips visible</short>
-	<long>Whether the subfolder tooltips of the selected folder
-	are drawn.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/baobab/ui/active_chart</key>
       <applyto>/apps/baobab/ui/active_chart</applyto>
       <owner>baobab</owner>
diff --git a/baobab/src/baobab-ringschart.c b/baobab/src/baobab-ringschart.c
index 4e51c01..40b24f6 100644
--- a/baobab/src/baobab-ringschart.c
+++ b/baobab/src/baobab-ringschart.c
@@ -130,7 +130,7 @@ baobab_ringschart_init (BaobabRingschart *chart)
 
   priv = BAOBAB_RINGSCHART_GET_PRIVATE (chart);
 
-  priv->subfoldertips_enabled = FALSE;
+  priv->subfoldertips_enabled = TRUE;
   priv->highlighted_item = NULL;
   priv->tips_timeout_event = 0;
   priv->subtip_items = NULL;
diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
index 2a916b9..bc2d722 100644
--- a/baobab/src/baobab.c
+++ b/baobab/src/baobab.c
@@ -758,18 +758,6 @@ baobab_create_statusbar (void)
 }
 
 static void
-baobab_subfolderstips_toggled (GConfClient *client,
-			       guint cnxn_id,
-			       GConfEntry *entry,
-			       gpointer user_data)
-{
-	baobab_ringschart_set_subfoldertips_enabled (baobab.rings_chart,
-						     gconf_client_get_bool (baobab.gconf_client,
-									    BAOBAB_SUBFLSTIPS_VISIBLE_KEY,
-									    NULL));
-}
-
-static void
 baobab_set_excluded_locations (GSList *excluded_uris)
 {
 	GSList *l;
@@ -899,8 +887,6 @@ baobab_init (void)
 				 NULL, NULL, NULL);
 	gconf_client_notify_add (baobab.gconf_client, SYSTEM_TOOLBAR_STYLE_KEY, baobab_toolbar_style,
 				 NULL, NULL, NULL);
-	gconf_client_notify_add (baobab.gconf_client, BAOBAB_SUBFLSTIPS_VISIBLE_KEY, baobab_subfolderstips_toggled,
-				 NULL, NULL, NULL);
 	gconf_client_notify_add (baobab.gconf_client, BAOBAB_ENABLE_HOME_MONITOR_KEY, baobab_monitor_home_toggled,
 				 NULL, NULL, NULL);
 
@@ -1213,10 +1199,7 @@ initialize_charts (void)
 					     COL_H_PERC,
 					     COL_H_ELEMENTS,
 					     NULL);
-	baobab_ringschart_set_subfoldertips_enabled (baobab.rings_chart,
-						     gconf_client_get_bool (baobab.gconf_client,
-									    BAOBAB_SUBFLSTIPS_VISIBLE_KEY,
-									    NULL));
+
 	baobab_chart_set_max_depth (baobab.rings_chart, 1);
 	g_signal_connect (baobab.rings_chart, "item_activated",
 			  G_CALLBACK (on_chart_item_activated), NULL);
diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h
index fa62590..9bb1814 100644
--- a/baobab/src/baobab.h
+++ b/baobab/src/baobab.h
@@ -36,7 +36,6 @@ struct BaobabSearchOpt;
 #define BAOBAB_KEY_DIR "/apps/baobab"
 #define BAOBAB_TOOLBAR_VISIBLE_KEY	BAOBAB_KEY_DIR "/ui/toolbar_visible"
 #define BAOBAB_STATUSBAR_VISIBLE_KEY	BAOBAB_KEY_DIR "/ui/statusbar_visible"
-#define BAOBAB_SUBFLSTIPS_VISIBLE_KEY   BAOBAB_KEY_DIR "/ui/baobab_subfoldertips_visible"
 #define BAOBAB_ACTIVE_CHART_KEY		BAOBAB_KEY_DIR "/ui/active_chart"
 #define BAOBAB_EXCLUDED_DIRS_KEY	BAOBAB_KEY_DIR "/properties/skip_scan_uri_list"
 #define BAOBAB_ENABLE_HOME_MONITOR_KEY	BAOBAB_KEY_DIR "/properties/enable_home_monitor"