GNOME.org
 

[nautilus] all: don't use eel_g_settings_add_auto_* methods

commit 253345f0841a38fcf02023bc2acd8bdc26842160
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Jan 30 15:53:44 2011 -0500

    all: don't use eel_g_settings_add_auto_* methods
    
    It makes no sense to use caching now with GSettings, as lookup
    operations are fast enough.

 libnautilus-private/nautilus-file.c             |   11 +--
 libnautilus-private/nautilus-icon-canvas-item.c |   19 ++----
 libnautilus-private/nautilus-thumbnails.c       |   12 +--
 src/nautilus-desktop-icon-view.c                |   13 +---
 src/nautilus-icon-view.c                        |   72 +++++--------------
 src/nautilus-list-view.c                        |   87 ++++++++++++-----------
 6 files changed, 81 insertions(+), 133 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index e531dd8..7cf3bd1 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -111,8 +111,6 @@ enum {
 	LAST_SIGNAL
 };
 
-static int date_format_pref;
-
 static guint signals[LAST_SIGNAL];
 
 static GHashTable *symbolic_links;
@@ -4416,13 +4414,15 @@ nautilus_file_fit_date_as_string (NautilusFile *file,
 	GDate *today;
 	GDate *file_date;
 	guint32 file_date_age;
-	int i;
+	int i, date_format_pref;
 
 	if (!nautilus_file_get_date (file, date_type, &file_time_raw)) {
 		return NULL;
 	}
 
 	file_time = localtime (&file_time_raw);
+	date_format_pref = g_settings_get_enum (nautilus_preferences,
+						NAUTILUS_PREFERENCES_DATE_FORMAT);
 
 	if (date_format_pref == NAUTILUS_DATE_FORMAT_LOCALE) {
 		return eel_strdup_strftime ("%c", file_time);
@@ -7987,11 +7987,6 @@ nautilus_file_class_init (NautilusFileClass *class)
 
 	g_type_class_add_private (class, sizeof (NautilusFileDetails));
 
-
-	eel_g_settings_add_auto_enum (nautilus_preferences,
-				      NAUTILUS_PREFERENCES_DATE_FORMAT,
-				      &date_format_pref);
-
 	thumbnail_limit_changed_callback (NULL);
 	g_signal_connect_swapped (nautilus_preferences,
 				  "changed::" NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index 02b7cdc..900a6b6 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -166,8 +166,6 @@ typedef enum {
 	TOP_SIDE
 } RectangleSide;
 
-static int click_policy_auto_value;
-
 static void nautilus_icon_canvas_item_text_interface_init (EelAccessibleTextIface *iface);
 static GType nautilus_icon_canvas_item_accessible_factory_get_type (void);
 
@@ -210,16 +208,6 @@ static void       nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIc
 static void
 nautilus_icon_canvas_item_init (NautilusIconCanvasItem *icon_item)
 {
-	static gboolean setup_auto_enums = FALSE;
-
-	if (!setup_auto_enums) {
-		eel_g_settings_add_auto_enum
-			(nautilus_preferences,
-			 NAUTILUS_PREFERENCES_CLICK_POLICY,
-			 &click_policy_auto_value);
-		setup_auto_enums = TRUE;
-	}
-
 	icon_item->details = G_TYPE_INSTANCE_GET_PRIVATE ((icon_item), NAUTILUS_TYPE_ICON_CANVAS_ITEM, NautilusIconCanvasItemDetails);
 	nautilus_icon_canvas_item_invalidate_label_size (icon_item);
 }
@@ -754,7 +742,12 @@ nautilus_icon_canvas_item_update (EelCanvasItem *item,
 static gboolean
 in_single_click_mode (void)
 {
-	return click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE;
+	int click_policy;
+
+	click_policy = g_settings_get_enum (nautilus_preferences,
+					    NAUTILUS_PREFERENCES_CLICK_POLICY);
+
+	return click_policy == NAUTILUS_CLICK_POLICY_SINGLE;
 }
 
 
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index 68d94ef..faf9001 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -115,8 +115,6 @@ static NautilusThumbnailInfo *currently_thumbnailing = NULL;
 
 static GnomeDesktopThumbnailFactory *thumbnail_factory = NULL;
 
-static int thumbnail_icon_size = 0;
-
 static gboolean
 get_file_mtime (const char *file_uri, time_t* mtime)
 {
@@ -356,10 +354,14 @@ thumbnail_loader_size_prepared (GdkPixbufLoader *loader,
 				ThumbnailLoadArgs *args)
 {
 	int size = MAX (width, height);
+	int thumbnail_icon_size;
 
 	args->original_width = width;
 	args->original_height = height;
 
+	thumbnail_icon_size = g_settings_get_int (nautilus_icon_view_preferences,
+						  NAUTILUS_PREFERENCES_ICON_VIEW_THUMBNAIL_SIZE);
+
 	if (args->force_nominal) {
 		args->base_size = size;                        
 	} else if (args->base_size == 0) {
@@ -423,12 +425,6 @@ get_pixbuf_from_data (const unsigned char *buffer,
 	ThumbnailLoadArgs args;
 	GError *error;
 
-	if (thumbnail_icon_size == 0) {
-		eel_g_settings_add_auto_int (nautilus_icon_view_preferences,
-					     NAUTILUS_PREFERENCES_ICON_VIEW_THUMBNAIL_SIZE,
-					     &thumbnail_icon_size);
-	}
-
 	loader = gdk_pixbuf_loader_new ();
 	g_signal_connect (loader, "size-prepared",
 			  G_CALLBACK (thumbnail_loader_size_prepared),
diff --git a/src/nautilus-desktop-icon-view.c b/src/nautilus-desktop-icon-view.c
index 7f0537d..dec51c2 100644
--- a/src/nautilus-desktop-icon-view.c
+++ b/src/nautilus-desktop-icon-view.c
@@ -465,15 +465,10 @@ realized_callback (GtkWidget *widget, NautilusDesktopIconView *desktop_icon_view
 static NautilusZoomLevel
 get_default_zoom_level (void)
 {
-	static gboolean auto_storage_added = FALSE;
-	static NautilusZoomLevel default_zoom_level = NAUTILUS_ZOOM_LEVEL_STANDARD;
-
-	if (!auto_storage_added) {
-		auto_storage_added = TRUE;
-		eel_g_settings_add_auto_enum (nautilus_icon_view_preferences,
-					      NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
-					      (int *) &default_zoom_level);
-	}
+	NautilusZoomLevel default_zoom_level;
+
+	default_zoom_level = g_settings_get_enum (nautilus_icon_view_preferences,
+						  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL);
 
 	return CLAMP (default_zoom_level, NAUTILUS_ZOOM_LEVEL_SMALLEST, NAUTILUS_ZOOM_LEVEL_LARGEST);
 }
diff --git a/src/nautilus-icon-view.c b/src/nautilus-icon-view.c
index 3babd52..624d39c 100644
--- a/src/nautilus-icon-view.c
+++ b/src/nautilus-icon-view.c
@@ -158,9 +158,6 @@ static const SortCriterion sort_criteria[] = {
 	}
 };
 
-static gboolean default_sort_in_reverse_order = FALSE;
-static int preview_sound_auto_value;
-
 static void                 nautilus_icon_view_set_directory_sort_by        (NautilusIconView           *icon_view,
 									     NautilusFile         *file,
 									     const char           *sort_by);
@@ -722,24 +719,16 @@ nautilus_icon_view_get_directory_sort_by (NautilusIconView *icon_view,
 		 get_directory_sort_by, (icon_view, file));
 }
 
-static NautilusFileSortType default_sort_order = NAUTILUS_FILE_SORT_BY_DISPLAY_NAME;
-
 static NautilusFileSortType
 get_default_sort_order (NautilusFile *file, gboolean *reversed)
 {
-	static gboolean auto_storaged_added = FALSE;
-	NautilusFileSortType retval;
+	NautilusFileSortType retval, default_sort_order;
+	gboolean default_sort_in_reverse_order;
 
-	if (auto_storaged_added == FALSE) {
-		auto_storaged_added = TRUE;
-		eel_g_settings_add_auto_enum (nautilus_preferences,
-					      NAUTILUS_PREFERENCES_DEFAULT_SORT_ORDER,
-					      (int *) &default_sort_order);
-		eel_g_settings_add_auto_boolean (nautilus_preferences,
-						 NAUTILUS_PREFERENCES_DEFAULT_SORT_IN_REVERSE_ORDER,
-						 &default_sort_in_reverse_order);
-
-	}
+	default_sort_order = g_settings_get_enum (nautilus_preferences,
+						  NAUTILUS_PREFERENCES_DEFAULT_SORT_ORDER);
+	default_sort_in_reverse_order = g_settings_get_boolean (nautilus_preferences,
+								NAUTILUS_PREFERENCES_DEFAULT_SORT_IN_REVERSE_ORDER);
 
 	retval = nautilus_file_get_default_sort_type (file, reversed);
 
@@ -950,21 +939,11 @@ nautilus_icon_view_get_directory_tighter_layout (NautilusIconView *icon_view,
 		 get_directory_tighter_layout, (icon_view, file));
 }
 
-static gboolean default_directory_tighter_layout = FALSE;
-
 static gboolean
 get_default_directory_tighter_layout (void)
 {
-	static gboolean auto_storaged_added = FALSE;
-
-	if (auto_storaged_added == FALSE) {
-		auto_storaged_added = TRUE;
-		eel_g_settings_add_auto_boolean (nautilus_icon_view_preferences,
-						 NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT,
-						 &default_directory_tighter_layout);
-	}
-
-	return default_directory_tighter_layout;
+	return g_settings_get_boolean (nautilus_icon_view_preferences,
+				       NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT);
 }
 
 static gboolean
@@ -1088,27 +1067,20 @@ get_sort_criterion_by_sort_type (NautilusFileSortType sort_type)
 		}
 	}
 
-	return NULL;
+	return &sort_criteria[0];
 }
 
-static NautilusZoomLevel default_zoom_level = NAUTILUS_ZOOM_LEVEL_STANDARD;
-static NautilusZoomLevel default_compact_zoom_level = NAUTILUS_ZOOM_LEVEL_STANDARD;
 #define DEFAULT_ZOOM_LEVEL(icon_view) icon_view->details->compact ? default_compact_zoom_level : default_zoom_level
 
 static NautilusZoomLevel
 get_default_zoom_level (NautilusIconView *icon_view)
 {
-	static gboolean auto_storage_added = FALSE;
+	NautilusZoomLevel default_zoom_level, default_compact_zoom_level;
 
-	if (!auto_storage_added) {
-		auto_storage_added = TRUE;
-		eel_g_settings_add_auto_enum (nautilus_icon_view_preferences,
-					      NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
-					      (int *) &default_zoom_level);
-		eel_g_settings_add_auto_enum (nautilus_compact_view_preferences,
-					      NAUTILUS_PREFERENCES_COMPACT_VIEW_DEFAULT_ZOOM_LEVEL,
-					      (int *) &default_compact_zoom_level);
-	}
+	default_zoom_level = g_settings_get_enum (nautilus_icon_view_preferences,
+						  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL);
+	default_compact_zoom_level = g_settings_get_enum (nautilus_icon_view_preferences,
+							  NAUTILUS_PREFERENCES_COMPACT_VIEW_DEFAULT_ZOOM_LEVEL);
 
 	return CLAMP (DEFAULT_ZOOM_LEVEL(icon_view), NAUTILUS_ZOOM_LEVEL_SMALLEST, NAUTILUS_ZOOM_LEVEL_LARGEST);
 }
@@ -2089,8 +2061,11 @@ should_preview_sound (NautilusFile *file)
 {
 	GFile *location;
 	GFilesystemPreviewType use_preview;
+	int preview_sound_pref;
 
 	use_preview = nautilus_file_get_filesystem_use_preview (file);
+	preview_sound_pref = g_settings_get_enum (nautilus_preferences,
+						  NAUTILUS_PREFERENCES_PREVIEW_SOUND);
 
 	location = nautilus_file_get_location (file);
 	if (g_file_has_uri_scheme (location, "burn")) {
@@ -2100,11 +2075,11 @@ should_preview_sound (NautilusFile *file)
 	g_object_unref (location);
 
 	/* Check user performance preference */	
-	if (preview_sound_auto_value == NAUTILUS_SPEED_TRADEOFF_NEVER) {
+	if (preview_sound_pref == NAUTILUS_SPEED_TRADEOFF_NEVER) {
 		return FALSE;
 	}
 		
-	if (preview_sound_auto_value == NAUTILUS_SPEED_TRADEOFF_ALWAYS) {
+	if (preview_sound_pref == NAUTILUS_SPEED_TRADEOFF_ALWAYS) {
 		if (use_preview == G_FILESYSTEM_PREVIEW_TYPE_NEVER) {
 			return FALSE;
 		} else {
@@ -3002,7 +2977,6 @@ nautilus_icon_view_class_init (NautilusIconViewClass *klass)
 static void
 nautilus_icon_view_init (NautilusIconView *icon_view)
 {
-	static gboolean setup_sound_preview = FALSE;
 	NautilusIconContainer *icon_container;
 
         g_return_if_fail (gtk_bin_get_child (GTK_BIN (icon_view)) == NULL);
@@ -3019,14 +2993,6 @@ nautilus_icon_view_init (NautilusIconView *icon_view)
 						 NAUTILUS_ICON_LAYOUT_R_L_T_B :
 						 NAUTILUS_ICON_LAYOUT_L_R_T_B);
 
-	if (!setup_sound_preview) {
-		eel_g_settings_add_auto_enum (nautilus_preferences,
-					      NAUTILUS_PREFERENCES_PREVIEW_SOUND,
-					      &preview_sound_auto_value);
-
-		setup_sound_preview = TRUE;
-	}
-
 	g_signal_connect_swapped (nautilus_preferences,
 				  "changed::" NAUTILUS_PREFERENCES_DEFAULT_SORT_ORDER,
 				  G_CALLBACK (default_sort_order_changed_callback),
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 568db6f..4bb75bd 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -129,12 +129,6 @@ struct SelectionForeachData {
 /* Wait for the rename to end when activating a file being renamed */
 #define WAIT_FOR_RENAME_ON_ACTIVATE 200
 
-static int                      click_policy_auto_value;
-static NautilusFileSortType     default_sort_order_auto_value;
-static gboolean			default_sort_reversed_auto_value;
-static NautilusZoomLevel        default_zoom_level_auto_value;
-static char **                  default_visible_columns_auto_value;
-static char **                  default_column_order_auto_value;
 static GdkCursor *              hand_cursor = NULL;
 
 static GtkTargetList *          source_target_list = NULL;
@@ -171,6 +165,8 @@ static const char * default_trash_columns_order[] = {
 static const gchar*
 get_default_sort_order (NautilusFile *file, gboolean *reversed)
 {
+	NautilusFileSortType default_sort_order;
+	gboolean default_sort_reversed;
 	const gchar *retval;
 	const char *attributes[] = {
 		"name", /* is really "manually" which doesn't apply to lists */
@@ -187,8 +183,13 @@ get_default_sort_order (NautilusFile *file, gboolean *reversed)
 	retval = nautilus_file_get_default_sort_attribute (file, reversed);
 
 	if (retval == NULL) {
-		retval = attributes[default_sort_order_auto_value];
-		*reversed = default_sort_reversed_auto_value;
+		default_sort_order = g_settings_get_enum (nautilus_preferences,
+							  NAUTILUS_PREFERENCES_DEFAULT_SORT_ORDER);
+		default_sort_reversed = g_settings_get_boolean (nautilus_preferences,
+								NAUTILUS_PREFERENCES_DEFAULT_SORT_IN_REVERSE_ORDER);
+
+		retval = attributes[default_sort_order];
+		*reversed = default_sort_reversed;
 	}
 
 	return retval;
@@ -302,6 +303,13 @@ button_event_modifies_selection (GdkEventButton *event)
 	return (event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0;
 }
 
+static int
+get_click_policy (void)
+{
+	return g_settings_get_enum (nautilus_preferences,
+				    NAUTILUS_PREFERENCES_CLICK_POLICY);
+}
+
 static void
 nautilus_list_view_did_not_drag (NautilusListView *view,
 				 GdkEventButton *event)
@@ -327,7 +335,7 @@ nautilus_list_view_did_not_drag (NautilusListView *view,
 			}
 		}
 
-		if ((click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE)
+		if ((get_click_policy () == NAUTILUS_CLICK_POLICY_SINGLE)
 		    && !button_event_modifies_selection(event)) {
 			if (event->button == 1) {
 				activate_selected_items (view);
@@ -502,7 +510,7 @@ motion_notify_callback (GtkWidget *widget,
 		return FALSE;
 	}
 
-	if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE) {
+	if (get_click_policy () == NAUTILUS_CLICK_POLICY_SINGLE) {
 		GtkTreePath *old_hover_path;
 
 		old_hover_path = view->details->hover_path;
@@ -556,7 +564,7 @@ leave_notify_callback (GtkWidget *widget,
 
 	view = NAUTILUS_LIST_VIEW (callback_data);
 
-	if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE &&
+	if (get_click_policy () == NAUTILUS_CLICK_POLICY_SINGLE &&
 	    view->details->hover_path != NULL) {
 		gtk_tree_path_free (view->details->hover_path);
 		view->details->hover_path = NULL;
@@ -574,7 +582,7 @@ enter_notify_callback (GtkWidget *widget,
 
 	view = NAUTILUS_LIST_VIEW (callback_data);
 
-	if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE) {
+	if (get_click_policy () == NAUTILUS_CLICK_POLICY_SINGLE) {
 		if (view->details->hover_path != NULL) {
 			gtk_tree_path_free (view->details->hover_path);
 		}
@@ -648,7 +656,7 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
 	last_click_time = current_time;
 
 	/* Ignore double click if we are in single click mode */
-	if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE && click_count >= 2) {
+	if (get_click_policy () == NAUTILUS_CLICK_POLICY_SINGLE && click_count >= 2) {
 		return TRUE;
 	}
 
@@ -1440,7 +1448,7 @@ filename_cell_data_func (GtkTreeViewColumn *column,
 			    view->details->file_name_column_num, &text,
 			    -1);
 
-	if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE) {
+	if (get_click_policy () == NAUTILUS_CLICK_POLICY_SINGLE) {
 		path = gtk_tree_model_get_path (model, iter);
 
 		if (view->details->hover_path == NULL ||
@@ -1526,6 +1534,7 @@ create_and_set_up_tree_view (NautilusListView *view)
 	AtkObject *atk_obj;
 	GList *nautilus_columns;
 	GList *l;
+	gchar **default_column_order, **default_visible_columns;
 	
 	view->details->tree_view = GTK_TREE_VIEW (gtk_tree_view_new ());
 	view->details->columns = g_hash_table_new_full (g_str_hash, 
@@ -1690,12 +1699,17 @@ create_and_set_up_tree_view (NautilusListView *view)
 	}
 	nautilus_column_list_free (nautilus_columns);
 
+	default_visible_columns = g_settings_get_strv (nautilus_list_view_preferences,
+						       NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS);
+	default_column_order = g_settings_get_strv (nautilus_list_view_preferences,
+						    NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER);
+
 	/* Apply the default column order and visible columns, to get it
 	 * right most of the time. The metadata will be checked when a 
 	 * folder is loaded */
 	apply_columns_settings (view,
-				default_column_order_auto_value,
-				default_visible_columns_auto_value);
+				default_column_order,
+				default_visible_columns);
 
 	gtk_widget_show (GTK_WIDGET (view->details->tree_view));
 	gtk_container_add (GTK_CONTAINER (view), GTK_WIDGET (view->details->tree_view));
@@ -1703,6 +1717,9 @@ create_and_set_up_tree_view (NautilusListView *view)
 
         atk_obj = gtk_widget_get_accessible (GTK_WIDGET (view->details->tree_view));
         atk_object_set_name (atk_obj, _("List View"));
+
+	g_strfreev (default_visible_columns);
+	g_strfreev (default_column_order);
 }
 
 static void
@@ -1749,7 +1766,8 @@ get_visible_columns (NautilusListView *list_view)
 
 	return nautilus_file_is_in_trash (file) ?
 		g_strdupv ((gchar **) default_trash_visible_columns) :
-		g_strdupv (default_visible_columns_auto_value);
+		g_settings_get_strv (nautilus_list_view_preferences,
+				     NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS);
 }
 
 static char **
@@ -1787,7 +1805,8 @@ get_column_order (NautilusListView *list_view)
 
 	return nautilus_file_is_in_trash (file) ?
 		g_strdupv ((gchar **) default_trash_columns_order) :
-		g_strdupv (default_column_order_auto_value);
+		g_settings_get_strv (nautilus_list_view_preferences,
+				     NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER);
 }
 
 static void
@@ -1853,7 +1872,8 @@ static NautilusZoomLevel
 get_default_zoom_level (void) {
 	NautilusZoomLevel default_zoom_level;
 
-	default_zoom_level = default_zoom_level_auto_value;
+	default_zoom_level = g_settings_get_enum (nautilus_list_view_preferences,
+						  NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL);
 
 	if (default_zoom_level <  NAUTILUS_ZOOM_LEVEL_SMALLEST
 	    || NAUTILUS_ZOOM_LEVEL_LARGEST < default_zoom_level) {
@@ -2326,11 +2346,13 @@ column_chooser_use_default_callback (NautilusColumnChooser *chooser,
 	 */
 	default_columns = nautilus_file_is_in_trash (file) ?
 		g_strdupv ((gchar **) default_trash_visible_columns) :
-		g_strdupv (default_visible_columns_auto_value);
+		g_settings_get_strv (nautilus_list_view_preferences,
+				     NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS);
 
 	default_order = nautilus_file_is_in_trash (file) ?
 		g_strdupv ((gchar **) default_trash_columns_order) :
-		g_strdupv (default_column_order_auto_value);
+		g_settings_get_strv (nautilus_list_view_preferences,
+				     NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER);
 
 	apply_columns_settings (view, default_order, default_columns);
 	column_chooser_set_from_arrays (chooser, view,
@@ -2732,7 +2754,7 @@ nautilus_list_view_click_policy_changed (NautilusView *directory_view)
 	view = NAUTILUS_LIST_VIEW (directory_view);
 
 	/* ensure that we unset the hand cursor and refresh underlined rows */
-	if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_DOUBLE) {
+	if (get_click_policy () == NAUTILUS_CLICK_POLICY_DOUBLE) {
 		if (view->details->hover_path != NULL) {
 			if (gtk_tree_model_get_iter (GTK_TREE_MODEL (view->details->model),
 						     &iter, view->details->hover_path)) {
@@ -2756,7 +2778,7 @@ nautilus_list_view_click_policy_changed (NautilusView *directory_view)
 		}
 
 		g_clear_object (&hand_cursor);
-	} else if (click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE) {
+	} else if (get_click_policy () == NAUTILUS_CLICK_POLICY_SINGLE) {
 		if (hand_cursor == NULL) {
 			hand_cursor = gdk_cursor_new(GDK_HAND2);
 		}
@@ -3076,25 +3098,6 @@ nautilus_list_view_class_init (NautilusListViewClass *class)
 	nautilus_view_class->get_view_id = nautilus_list_view_get_id;
 	nautilus_view_class->get_first_visible_file = nautilus_list_view_get_first_visible_file;
 	nautilus_view_class->scroll_to_file = list_view_scroll_to_file;
-
-	eel_g_settings_add_auto_enum (nautilus_preferences,
-				      NAUTILUS_PREFERENCES_CLICK_POLICY,
-				      &click_policy_auto_value);
-	eel_g_settings_add_auto_enum (nautilus_preferences,
-				      NAUTILUS_PREFERENCES_DEFAULT_SORT_ORDER,
-				      (int *) &default_sort_order_auto_value);
-	eel_g_settings_add_auto_boolean (nautilus_preferences,
-					 NAUTILUS_PREFERENCES_DEFAULT_SORT_IN_REVERSE_ORDER,
-					 &default_sort_reversed_auto_value);
-	eel_g_settings_add_auto_enum (nautilus_list_view_preferences,
-				      NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL,
-				      (int *) &default_zoom_level_auto_value);
-	eel_g_settings_add_auto_strv (nautilus_list_view_preferences,
-				      NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS,
-				      &default_visible_columns_auto_value);
-	eel_g_settings_add_auto_strv (nautilus_list_view_preferences,
-				      NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER,
-				      &default_column_order_auto_value);
 }
 
 static void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]