[nautilus] Remove deprecated prefs for nautilus theme

[Alexander Larsson <alexl src gnome org>]

commit c70466a133e6ca670e998af11bdc39aa2aec4825
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Jul 21 14:27:12 2010 +0200

    Remove deprecated prefs for nautilus theme

 .../nautilus-directory-background.c                |    8 -------
 libnautilus-private/nautilus-global-preferences.c  |    4 ---
 libnautilus-private/nautilus-global-preferences.h  |    3 --
 libnautilus-private/nautilus-icon-container.c      |   11 +--------
 src/nautilus-property-browser.c                    |   21 --------------------
 5 files changed, 2 insertions(+), 45 deletions(-)
---
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c
index a0e9e17..e7e7dc2 100644
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@@ -573,9 +573,6 @@ background_destroyed_callback (EelBackground *background,
                 (file,
                  G_CALLBACK (saved_settings_changed_callback), background);
         nautilus_file_monitor_remove (file, background);
-	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
-                                         nautilus_file_background_theme_changed,
-                                         background);
 	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_BACKGROUND_SET,
                                          nautilus_file_background_theme_changed,
                                          background);
@@ -621,9 +618,6 @@ nautilus_connect_background_to_file_metadata (GtkWidget    *widget,
                         (old_file,
                          G_CALLBACK (saved_settings_changed_callback), background);
 		nautilus_file_monitor_remove (old_file, background);
-		eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
-                                                 nautilus_file_background_theme_changed,
-                                                 background);
 		eel_preferences_remove_callback (NAUTILUS_PREFERENCES_BACKGROUND_SET,
                                                  nautilus_file_background_theme_changed,
                                                  background);
@@ -660,8 +654,6 @@ nautilus_connect_background_to_file_metadata (GtkWidget    *widget,
                                            NAUTILUS_FILE_ATTRIBUTE_INFO);
 
 		/* arrange for notification when the theme changes */
-		eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME,
-                                              nautilus_file_background_theme_changed, background);
 		eel_preferences_add_callback (NAUTILUS_PREFERENCES_BACKGROUND_SET,
                                               nautilus_file_background_theme_changed, background);
 		eel_preferences_add_callback (NAUTILUS_PREFERENCES_BACKGROUND_COLOR,
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index b3f0fc8..176896c 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -289,10 +289,6 @@ static const PreferenceDefault preference_defaults[] = {
 	  PREFERENCE_BOOLEAN,
 	  GINT_TO_POINTER (TRUE)
 	},
-	{ NAUTILUS_PREFERENCES_THEME,
-	  PREFERENCE_STRING,
-	  "default"
-	},
 	{ NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
 	  PREFERENCE_STRING,
 	  "local_only",
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index eda7c18..2fefabb 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -33,9 +33,6 @@ G_BEGIN_DECLS
 /* Whether exit when last window destroyed */
 #define NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW				"preferences/exit_with_last_window"
 
-/* Which theme is active */
-#define NAUTILUS_PREFERENCES_THEME				"/desktop/gnome/file_views/icon_theme"
-
 /* Desktop Background options */
 #define NAUTILUS_PREFERENCES_BACKGROUND_SET                     "preferences/background_set" 
 #define NAUTILUS_PREFERENCES_BACKGROUND_COLOR                   "preferences/background_color" 
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index daae378..c658b53 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -4050,10 +4050,6 @@ finalize (GObject *object)
 
 	details = NAUTILUS_ICON_CONTAINER (object)->details;
 
-	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
-					 nautilus_icon_container_theme_changed,
-					 object);
-	
 	g_hash_table_destroy (details->icon_set);
 	details->icon_set = NULL;
 
@@ -4227,7 +4223,7 @@ style_set (GtkWidget *widget,
 
 	container->details->use_drop_shadows = container->details->drop_shadows_requested && !frame_text;
 
-	nautilus_icon_container_theme_changed (NAUTILUS_ICON_CONTAINER (widget));	
+	nautilus_icon_container_theme_changed (NAUTILUS_ICON_CONTAINER (widget));
 
 	if (gtk_widget_get_realized (widget)) {
 		invalidate_label_sizes (container);
@@ -6326,12 +6322,9 @@ nautilus_icon_container_init (NautilusIconContainer *container)
 			  G_CALLBACK (handle_focus_out_event), NULL);
 
 	eel_background_set_use_base (background, TRUE);
-	
+
 	/* read in theme-dependent data */
 	nautilus_icon_container_theme_changed (container);
-	eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME,
-				      nautilus_icon_container_theme_changed,
-				      container);
 
 	if (!setup_prefs) {
 		eel_preferences_add_callback (NAUTILUS_PREFERENCES_ICON_VIEW_TEXT_ELLIPSIS_LIMIT,
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index e166374..29a30a0 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -153,7 +153,6 @@ static void     nautilus_property_browser_drag_data_get         (GtkWidget
 								 GtkSelectionData              *selection_data,
 								 guint                          info,
 								 guint32                        time);
-static void     nautilus_property_browser_theme_changed         (gpointer                       user_data);
 static void     emit_emblems_changed_signal                     (void);
 static void     emblems_changed_callback                        (GObject                       *signaller,
 								 NautilusPropertyBrowser       *property_browser);
@@ -385,11 +384,6 @@ nautilus_property_browser_init (GtkObject *object)
 	/* the actual contents are created when necessary */	
   	property_browser->details->content_frame = NULL;
 
-	/* add a callback for when the theme changes */
-	eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, 
-				      nautilus_property_browser_theme_changed,
-				      property_browser);	
-	
 	g_signal_connect (property_browser, "delete_event",
 			  G_CALLBACK (nautilus_property_browser_delete_event_callback), NULL);
 	g_signal_connect (property_browser, "hide",
@@ -445,10 +439,6 @@ nautilus_property_browser_destroy (GtkObject *object)
 	
 	g_free (property_browser->details);
 	
-	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
-					 nautilus_property_browser_theme_changed,
-					 property_browser);
-		
 	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
@@ -1948,17 +1938,6 @@ make_properties_from_xml_node (NautilusPropertyBrowser *property_browser,
 	}
 }
 
-/* handle theme changes by updating the browser contents */
-
-static void
-nautilus_property_browser_theme_changed (gpointer user_data)
-{
-	NautilusPropertyBrowser *property_browser;
-	
-	property_browser = NAUTILUS_PROPERTY_BROWSER(user_data);
-	nautilus_property_browser_update_contents (property_browser);
-}
-
 /* make_category generates widgets corresponding all of the objects in the passed in directory */
 static void
 make_category(NautilusPropertyBrowser *property_browser, const char* path, const char* mode, xmlNodePtr node, const char *description)