Fixed bug 992 ("Fully Decorate Remote Views" is not a

	sensible preference). Note that before making the
	quick wording fix Darin, Ian, and I came up with a
	longer-term plan for handling this general kind of
	thing well (bug 995).

	* libnautilus-extensions/nautilus-global-preferences.h:
	* libnautilus-extensions/nautilus-directory-async.c:
	(state_changed):
	* libnautilus-extensions/nautilus-global-preferences.c:
	(global_preferences_create_dialog),
	(global_preferences_register_for_ui):
	* libnautilus-extensions/nautilus-icon-factory.c:
	(nautilus_icon_factory_get_icon_for_file):
	Changed "Fully Decorate Remote Views" to "Display text in
	icons even for remote text files"
	Changed NAUTILUS_PREFERENCES_REMOTE_VIEWS to
	NAUTILUS_PREFERENCES_SHOW_TEXT_IN_REMOTE_ICONS

4 files changed, 7 insertions, 8 deletions

diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 5f2e43421..b3003adeb 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -1677,8 +1677,8 @@ state_changed (NautilusDirectory *directory)
 	start_getting_directory_counts (directory);
 
 	/* Start or stop getting top left pieces of files. */
-	if(nautilus_directory_is_local(directory) || 
-			nautilus_preferences_get_boolean(NAUTILUS_PREFERENCES_REMOTE_VIEWS, FALSE)) {
+	if (nautilus_directory_is_local(directory) || 
+			nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_REMOTE_ICONS, FALSE)) {
 		start_getting_top_lefts (directory);
 	}
 }
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 2c82e950a..fdccc382a 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -124,7 +124,7 @@ global_preferences_create_dialog (void)
 	
 	nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (directory_views_pane),
 							 2,
-							 NAUTILUS_PREFERENCES_REMOTE_VIEWS,
+							 NAUTILUS_PREFERENCES_SHOW_TEXT_IN_REMOTE_ICONS,
 							 NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
 
 	/*
@@ -358,8 +358,8 @@ global_preferences_register_for_ui (void)
 					     NAUTILUS_CLICK_POLICY_DOUBLE);
 
 	/* remote views */
-	nautilus_preferences_set_info (NAUTILUS_PREFERENCES_REMOTE_VIEWS,
-			               "Fully Decorate Remote Views",
+	nautilus_preferences_set_info (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_REMOTE_ICONS,
+			               "Display text in icons even for remote text files",
 				       NAUTILUS_PREFERENCE_BOOLEAN,
 				       (gconstpointer) FALSE);
 
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index a52095fda..ecd95ed5f 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -66,7 +66,7 @@ enum
 	NAUTILUS_CLICK_POLICY_DOUBLE
 };
 
-#define NAUTILUS_PREFERENCES_REMOTE_VIEWS "/nautilus/preferences/remote_views"
+#define NAUTILUS_PREFERENCES_SHOW_TEXT_IN_REMOTE_ICONS "/nautilus/preferences/remote_icon_text"
 
 void                      nautilus_global_preferences_startup                            (void);
 void                      nautilus_global_preferences_shutdown                           (void);
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 999b8f05d..c01091741 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -848,8 +848,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char* modifie
 		icon_name = g_strdup (nautilus_icon_factory_get_icon_name_for_file (file));
 	}
 
-	if (nautilus_file_is_local (file) ||
-									nautilus_preferences_get_boolean(NAUTILUS_PREFERENCES_REMOTE_VIEWS, FALSE)) {
+	if (nautilus_file_is_local (file) || nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_REMOTE_ICONS, FALSE)) {
 		top_left_text = nautilus_file_get_top_left_text (file);
 	}