Update for latest round of stuff moving into Eel.

6 files changed, 119 insertions, 119 deletions

diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c
index 056146052..c78d7b348 100644
--- a/components/adapter/nautilus-adapter.c
+++ b/components/adapter/nautilus-adapter.c
@@ -27,22 +27,22 @@
 
 #include <config.h>
 #include "nautilus-adapter.h"
-#include "nautilus-adapter-load-strategy.h"
-#include "nautilus-adapter-embed-strategy.h"
-#include "nautilus-adapter-embed-strategy-private.h"
 
+#include "nautilus-adapter-embed-strategy-private.h"
+#include "nautilus-adapter-embed-strategy.h"
+#include "nautilus-adapter-load-strategy.h"
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-item-container.h>
-#include <bonobo/bonobo-view-frame.h>
 #include <bonobo/bonobo-object-client.h>
-#include <gtk/gtksignal.h>
+#include <bonobo/bonobo-view-frame.h>
+#include <eel/eel-generous-bin.h>
+#include <eel/eel-gtk-macros.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
-#include <libnautilus/nautilus-bonobo-ui.h>
-#include <eel/eel-gtk-macros.h>
-#include <libnautilus-private/nautilus-generous-bin.h>
 #include <libnautilus-adapter/nautilus-adapter-factory.h>
+#include <libnautilus/nautilus-bonobo-ui.h>
 
 struct NautilusAdapterDetails {
 	NautilusView                 *nautilus_view;
@@ -166,7 +166,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
 
 
 	/* Set up a few wrapper framework details */
-	bin =  gtk_widget_new (NAUTILUS_TYPE_GENEROUS_BIN, NULL);
+	bin =  gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL);
 	gtk_widget_show (bin);
 	control = bonobo_control_new (bin);
 	adapter->details->nautilus_view = nautilus_view_new_from_bonobo_control (control);
diff --git a/components/news/nautilus-news.c b/components/news/nautilus-news.c
index ff8213f87..2e2cfb4e5 100644
--- a/components/news/nautilus-news.c
+++ b/components/news/nautilus-news.c
@@ -334,12 +334,12 @@ do_destroy (GtkObject *obj, News *news)
 	/* free all the channel data */
 	nautilus_news_free_channel_list (news);
 	
-	nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS,
-					      max_items_changed,
-					      news);
-	nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL,
-					      update_interval_changed,
-					      news);
+	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS,
+                                         max_items_changed,
+                                         news);
+	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL,
+                                         update_interval_changed,
+                                         news);
 	
         g_free (news);
 }
@@ -1740,7 +1740,7 @@ max_items_changed (gpointer user_data)
 	
 	news = (News*) user_data;
 	
-	news->max_item_count = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS);
+	news->max_item_count = eel_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS);
 	if (news->max_item_count <= 0) {
 		news->max_item_count = 2;		
 	}
@@ -1754,7 +1754,7 @@ update_interval_changed (gpointer user_data)
 	
 	news = (News*) user_data;
 	
-	news->update_interval = 60 * nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL);
+	news->update_interval = 60 * eel_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL);
 	if (news->update_interval < 60) {
 		news->update_interval = 60;		
 	}
@@ -2420,8 +2420,8 @@ make_news_view (const char *iid, gpointer callback_data)
  	news->bold_font = eel_scalable_font_get_default_bold_font ();
        	
 	/* get preferences and sanity check them */
-	news->max_item_count = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS);
-	news->update_interval = 60 * nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL);	
+	news->max_item_count = eel_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS);
+	news->update_interval = 60 * eel_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL);	
 	
 	if (news->max_item_count <= 0) {
 		news->max_item_count = 2;		
@@ -2429,8 +2429,8 @@ make_news_view (const char *iid, gpointer callback_data)
 	if (news->update_interval < 60) {
 		news->update_interval = 60;		
 	}
-	nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS, max_items_changed, news);	
-	nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL, update_interval_changed, news);
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS, max_items_changed, news);	
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL, update_interval_changed, news);
 	
 	/* load some images */
 	nautilus_news_load_images (news);
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index 651512448..661c1be8b 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -134,12 +134,12 @@ nautilus_text_view_initialize_class (NautilusTextViewClass *klass)
 	object_class->destroy = nautilus_text_view_destroy;
 
 	/* Text view component fonts */
-	nautilus_preferences_default_set_string (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT,
-						 NAUTILUS_USER_LEVEL_INTERMEDIATE,
-						 "fixed");
-	nautilus_preferences_default_set_integer (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE,
-						  NAUTILUS_USER_LEVEL_INTERMEDIATE,
-						  14);
+	eel_preferences_default_set_string (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT,
+                                            EEL_USER_LEVEL_INTERMEDIATE,
+                                            "fixed");
+	eel_preferences_default_set_integer (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE,
+                                             EEL_USER_LEVEL_INTERMEDIATE,
+                                             14);
 }
 
 /* initialize ourselves by connecting to the location change signal and allocating our subviews */
@@ -206,14 +206,14 @@ nautilus_text_view_initialize (NautilusTextView *text_view)
 	nautilus_text_view_update_font (text_view);
 
 	/* Keep track of font changes */
-	nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT,
-                                                       font_changed_callback,
-                                                       text_view,
-                                                       GTK_OBJECT (text_view));
-	nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE,
-                                                       font_changed_callback,
-                                                       text_view,
-                                                       GTK_OBJECT (text_view));
+	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT,
+                                                  font_changed_callback,
+                                                  text_view,
+                                                  GTK_OBJECT (text_view));
+	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE,
+                                                  font_changed_callback,
+                                                  text_view,
+                                                  GTK_OBJECT (text_view));
 	
 	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
@@ -429,11 +429,11 @@ nautilus_text_view_update_font (NautilusTextView *text_view)
 	GdkFont *font;
 	int font_size;
 
-	font_size = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE);
+	font_size = eel_preferences_get_integer (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE);
 
 	font_size += text_view_font_size_deltas[text_view->details->zoom_index];
 
-	font_name = nautilus_preferences_get (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT);
+	font_name = eel_preferences_get (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT);
 	g_return_if_fail (font_name != NULL);
 
 	font = nautilus_font_factory_get_font_by_family (font_name, font_size);
@@ -457,7 +457,7 @@ handle_ui_event (BonoboUIComponent *ui,
 {
 	if (type == Bonobo_UIComponent_STATE_CHANGED
             && eel_str_is_equal (state, "1")) {
-                nautilus_preferences_set (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, id);
+                eel_preferences_set (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, id);
 	}
 }
 
diff --git a/components/throbber/nautilus-throbber.c b/components/throbber/nautilus-throbber.c
index cce3dff0e..24132ac39 100644
--- a/components/throbber/nautilus-throbber.c
+++ b/components/throbber/nautilus-throbber.c
@@ -191,10 +191,10 @@ nautilus_throbber_destroy (GtkObject *object)
 	nautilus_throbber_remove_update_callback (throbber);
 	nautilus_throbber_unload_images (throbber);
 
-	nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
-					      nautilus_throbber_theme_changed,
-					      object);
-
+	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
+					 nautilus_throbber_theme_changed,
+					 object);
+	
 	if (throbber->details->property_bag) {
 		bonobo_object_unref (BONOBO_OBJECT (throbber->details->property_bag));
 	}
@@ -306,9 +306,9 @@ nautilus_throbber_initialize (NautilusThrobber *throbber)
 	gtk_widget_show (widget);
 	
 	/* add a callback for when the theme changes */
-	nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME,
-					  nautilus_throbber_theme_changed,
-					  throbber);
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME,
+				      nautilus_throbber_theme_changed,
+				      throbber);
 }
 
 /* allocate a new throbber */
diff --git a/components/tree/nautilus-tree-expansion-state.c b/components/tree/nautilus-tree-expansion-state.c
index fac375d09..b7f073d3e 100644
--- a/components/tree/nautilus-tree-expansion-state.c
+++ b/components/tree/nautilus-tree-expansion-state.c
@@ -29,7 +29,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
-#include <libnautilus-private/nautilus-preferences.h>
+#include <libnautilus-private/nautilus-global-preferences.h>
 
 struct NautilusTreeExpansionStateDetails {
 	GHashTable *table;
@@ -85,7 +85,7 @@ nautilus_tree_expansion_state_load_from_preferences (NautilusTreeExpansionState
 {
 	EelStringList *uris;
 
-	uris = nautilus_preferences_get_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE);
+	uris = eel_preferences_get_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE);
 
 	eel_string_list_for_each (uris, expansion_state_load_callback, expansion_state);
 	eel_string_list_free (uris);
@@ -124,7 +124,7 @@ nautilus_tree_expansion_state_save_to_preferences (NautilusTreeExpansionState *e
 	glist = eel_g_str_list_alphabetize (glist);
 
 	uris = eel_string_list_new_from_g_list (glist, TRUE);
-	nautilus_preferences_set_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE, uris);
+	eel_preferences_set_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE, uris);
 	g_list_free (glist);
 	eel_string_list_free (uris);
 }
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
index 709ca6873..1982617b0 100644
--- a/components/tree/nautilus-tree-view.c
+++ b/components/tree/nautilus-tree-view.c
@@ -245,17 +245,17 @@ nautilus_tree_view_insert_model_node (NautilusTreeView *view, NautilusTreeNode *
 
 			view->details->inserting_node = TRUE;
 			EEL_CLIST_UNSET_FLAG (EEL_CLIST (view->details->tree),
-						   CLIST_AUTO_SORT);
+					      CLIST_AUTO_SORT);
 			view_node = eel_ctree_insert_node (EEL_CTREE (view->details->tree),
-								parent_view_node, 
-								NULL,
-								text,
-								TREE_SPACING,
-								closed_pixbuf, open_pixbuf,
-								! nautilus_file_is_directory (file),
-								FALSE);
+							   parent_view_node, 
+							   NULL,
+							   text,
+							   TREE_SPACING,
+							   closed_pixbuf, open_pixbuf,
+							   ! nautilus_file_is_directory (file),
+							   FALSE);
 			EEL_CLIST_SET_FLAG (EEL_CLIST (view->details->tree),
-						 CLIST_AUTO_SORT);
+					    CLIST_AUTO_SORT);
 			view->details->inserting_node = FALSE;
 
 			gdk_pixbuf_unref (closed_pixbuf);
@@ -263,8 +263,8 @@ nautilus_tree_view_insert_model_node (NautilusTreeView *view, NautilusTreeNode *
 
 
 			eel_ctree_node_set_row_data (EEL_CTREE (view->details->tree),
-							  view_node,
-							  node);
+						     view_node,
+						     node);
 
 			g_assert (g_hash_table_lookup (view->details->file_to_node_map, file) == NULL);
 
@@ -279,13 +279,13 @@ nautilus_tree_view_insert_model_node (NautilusTreeView *view, NautilusTreeNode *
 					if (!ctree_is_node_expanded (EEL_CTREE (view->details->tree),
 								     view_node)) {
 						eel_ctree_expand (EEL_CTREE (view->details->tree),
-								       view_node);
+								  view_node);
 					} 
 				} else {
 					if (ctree_is_node_expanded (EEL_CTREE (view->details->tree),
 								    view_node)) {
 						eel_ctree_collapse (EEL_CTREE (view->details->tree),
-									 view_node);
+								    view_node);
 					}
 				}
 			}
@@ -317,7 +317,7 @@ forget_view_node (NautilusTreeView *view,
 	forget_unparented_node (view, node);
 
 	eel_ctree_node_set_row_data (EEL_CTREE (view->details->tree),
-					  view_node, NULL);
+				     view_node, NULL);
 
 	g_hash_table_remove (view->details->file_to_node_map, file);
 	nautilus_file_unref (file);
@@ -367,12 +367,12 @@ nautilus_tree_view_remove_model_node (NautilusTreeView *view, NautilusTreeNode *
 		 * Note that it would be better to remove the expansion
 		 * state of the children, but that breaks renaming..
 		 */
-		 uri = map_view_node_to_uri (view, view_node);
-		 nautilus_tree_expansion_state_remove_node (view->details->expansion_state, uri);
+		uri = map_view_node_to_uri (view, view_node);
+		nautilus_tree_expansion_state_remove_node (view->details->expansion_state, uri);
 
 		forget_view_node_and_children (view, view_node);
  		eel_ctree_remove_node (EEL_CTREE (view->details->tree),
- 					    view_node);
+				       view_node);
  	}
 
 	nautilus_tree_model_stop_monitoring_node (view->details->model, node, view);
@@ -440,14 +440,14 @@ nautilus_tree_view_update_model_node (NautilusTreeView *view, NautilusTreeNode *
 		name = nautilus_file_get_name (file);
 	
 		eel_ctree_set_node_info (EEL_CTREE (view->details->tree),
-					      view_node,
-					      name,
-					      TREE_SPACING,
-					      closed_pixbuf,
-					      open_pixbuf,
-					      ! nautilus_file_is_directory (file),
-					      ctree_is_node_expanded (EEL_CTREE (view->details->tree),
-								      view_node));
+					 view_node,
+					 name,
+					 TREE_SPACING,
+					 closed_pixbuf,
+					 open_pixbuf,
+					 ! nautilus_file_is_directory (file),
+					 ctree_is_node_expanded (EEL_CTREE (view->details->tree),
+								 view_node));
 
 		g_free (name);
 
@@ -463,13 +463,13 @@ nautilus_tree_view_update_model_node (NautilusTreeView *view, NautilusTreeNode *
 				if (!ctree_is_node_expanded (EEL_CTREE (view->details->tree),
 							     view_node)) {
 					eel_ctree_expand (EEL_CTREE (view->details->tree),
-							       view_node);
+							  view_node);
 				} 
 			} else {
 				if (ctree_is_node_expanded (EEL_CTREE (view->details->tree),
 							    view_node)) {
 					eel_ctree_collapse (EEL_CTREE (view->details->tree),
-								 view_node);
+							    view_node);
 				}
 			}
 
@@ -604,11 +604,11 @@ get_selected_row_position (EelCTree *ctree)
 	clist = EEL_CLIST (ctree);
 	selected_row = get_selected_row (ctree);
 	if (eel_clist_row_is_visible (clist,
-					   selected_row) == GTK_VISIBILITY_NONE) {
+				      selected_row) == GTK_VISIBILITY_NONE) {
 		return -1;
 	}
 	if (!eel_clist_get_selection_info (clist, 0, 0,
-						&top_row, &column)) {
+					   &top_row, &column)) {
 		return -1;
 	}
 	return selected_row - top_row;
@@ -811,13 +811,13 @@ filtering_changed_callback (gpointer callback_data)
 	view = NAUTILUS_TREE_VIEW (callback_data);
 
 	view->details->show_hidden_files = 
-		nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES);
+		eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES);
 	
 	view->details->show_backup_files = 
-		nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES);
+		eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES);
 
 	view->details->show_non_directories = 
-		! nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
+		! eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
 
 
 	/* Reload the whole tree so that the filtering changes take place. */
@@ -833,7 +833,7 @@ update_smooth_graphics_mode (NautilusTreeView *view)
 	gboolean aa_mode, old_aa_mode;
 
 	if (view->details->tree != NULL) {
-		aa_mode = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE);
+		aa_mode = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE);
 		old_aa_mode = is_anti_aliased (view);
 
 		if (old_aa_mode != aa_mode) {
@@ -935,15 +935,15 @@ create_tree (NautilusTreeView *view)
 	 * to using the standard clist comparison function (a strcmp)
 	 */
 	eel_clist_set_compare_func (EEL_CLIST (view->details->tree),
-					 ctree_compare_rows);
+				    ctree_compare_rows);
 
 	eel_clist_set_column_auto_resize (EEL_CLIST (view->details->tree), 0, TRUE);
 	eel_clist_columns_autosize (EEL_CLIST (view->details->tree));
 	eel_clist_set_reorderable (EEL_CLIST (view->details->tree), FALSE);
 	eel_clist_set_row_height (EEL_CLIST (view->details->tree),
-				       MAX (NAUTILUS_ICON_SIZE_FOR_MENUS,
-					    view->details->tree->style->font->ascent
-					    + view->details->tree->style->font->descent));
+				  MAX (NAUTILUS_ICON_SIZE_FOR_MENUS,
+				       view->details->tree->style->font->ascent
+				       + view->details->tree->style->font->descent));
         eel_ctree_set_indent (EEL_CTREE (view->details->tree), 12);
 
 	gtk_signal_connect (GTK_OBJECT (view->details->tree),
@@ -967,19 +967,19 @@ create_tree (NautilusTreeView *view)
 				  view);
 	
 	/* Keep track of changes in these prefs to filter files accordingly. */
-	nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
-					   filtering_changed_callback,
-					   view);
-	nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
-					   filtering_changed_callback,
-					   view);
-	nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
-					   filtering_changed_callback,
-					   view);
-
-	nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, 
-					   smooth_graphics_mode_changed_callback, 
-					   view);
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
+				      filtering_changed_callback,
+				      view);
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
+				      filtering_changed_callback,
+				      view);
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
+				      filtering_changed_callback,
+				      view);
+
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, 
+				      smooth_graphics_mode_changed_callback, 
+				      view);
 
 	view->details->file_to_node_map = g_hash_table_new (NULL, NULL);
 	view->details->view_node_to_uri_map = g_hash_table_new (NULL, NULL);
@@ -1037,13 +1037,13 @@ nautilus_tree_view_initialize (NautilusTreeView *view)
 
 	/* Obtain the filtering preferences */
 	view->details->show_hidden_files = 
-		nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES);
+		eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES);
 
 	view->details->show_backup_files = 
-		nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES);
+		eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES);
 
 	view->details->show_non_directories = 
-		! nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
+		! eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
 
 	gtk_signal_connect (GTK_OBJECT (view),
 			    "load_location",
@@ -1117,19 +1117,19 @@ nautilus_tree_view_destroy (GtkObject *object)
 			compare_cached_key = NULL;
 		}
 
-		nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
-						      filtering_changed_callback,
-						      view);
-		nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
-						      filtering_changed_callback,
-						      view);
-		nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
-						      filtering_changed_callback,
-						      view);
-
-		nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE,
-						      smooth_graphics_mode_changed_callback,
-						      view);
+		eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
+						 filtering_changed_callback,
+						 view);
+		eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
+						 filtering_changed_callback,
+						 view);
+		eel_preferences_remove_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
+						 filtering_changed_callback,
+						 view);
+
+		eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE,
+						 smooth_graphics_mode_changed_callback,
+						 view);
 		
 		g_hash_table_foreach (view->details->file_to_node_map,
 				      free_file_to_node_map_entry,
@@ -1170,7 +1170,7 @@ file_to_view_node (NautilusTreeView *view,
 
 EelCTreeNode *
 nautilus_tree_view_model_node_to_view_node (NautilusTreeView *view,
-			 NautilusTreeNode *node)
+					    NautilusTreeNode *node)
 {
 	EelCTreeNode *view_node;
 	NautilusFile *file;
@@ -1192,7 +1192,7 @@ nautilus_tree_view_node_to_model_node (NautilusTreeView *view,
 	NautilusTreeNode *tree_node;
 
 	tree_node = (NautilusTreeNode *) eel_ctree_node_get_row_data (EEL_CTREE (view->details->tree),
-									   node);
+								      node);
 
 	return tree_node;
 }
@@ -1310,13 +1310,13 @@ expand_uri_sequence_and_select_end (NautilusTreeView *view)
 
 			if (!ctree_is_node_expanded (EEL_CTREE (view->details->tree), view_node)) {
 				eel_ctree_expand (EEL_CTREE (view->details->tree),
-						       view_node);
+						  view_node);
 			}
 		} else {
 			g_free (view->details->selected_uri);
 			view->details->selected_uri = g_strdup (uri);
 			eel_ctree_select (EEL_CTREE (view->details->tree),
-					       view_node);
+					  view_node);
 		}
 	}
 		
@@ -1362,7 +1362,7 @@ select_current_location (NautilusTreeView *view)
 	 * should be used here.
 	 */
 	if (eel_strcmp (view->details->current_main_view_uri,
-			     view->details->selected_uri) == 0) {
+			view->details->selected_uri) == 0) {
 		return;
 	}