GNOME.org
 

[nautilus-actions] '-last-folder-uri' preferences are renamed as '-lfu'

commit 81d88f782fc0e242bfb01e68c1f58c1356852b28
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 14 17:22:53 2011 +0100

    '-last-folder-uri' preferences are renamed as '-lfu'
    
    + README-GCONF
    + src/core/na-settings.h
    + src/utils/na-gconf2key.sh.in.

 ChangeLog                    |    7 +++++++
 README-GCONF                 |   14 +++++++-------
 src/core/na-settings.h       |   14 +++++++-------
 src/utils/na-gconf2key.sh.in |   14 +++++++-------
 4 files changed, 28 insertions(+), 21 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3d6fb9a..c891302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,13 @@
 	* src/utils/nautilus-actions-run.c:
 	* src/utils/nautilus-actions-schemas.c: Add locale.h include.
 
+	* README-GCONF:
+	* src/core/na-settings.h:
+	* src/utils/na-gconf2key.sh.in:
+	'-last-folder-uri' preferences are renamed as '-lfu'.
+
+	* src/core/na-settings.c: Set default values.
+
 	* src/nact/nact-gtk-utils.c:
 	* src/nact/nact-gtk-utils.h (nact_gtk_utils_select_file,
 	nact_gtk_utils_select_file_with_preview, nact_gtk_utils_select_dir):
diff --git a/README-GCONF b/README-GCONF
index 258aaef..7fbefaf 100644
--- a/README-GCONF
+++ b/README-GCONF
@@ -73,25 +73,25 @@ Deprecating GConf
  export-assistant = [377,33,699,675]        [nact]     export-assistant-wsp
  export-ask-user = [377,33,699,675]         [nact]     export-ask-user-wsp
  export-ask-user-last-format = GConfEntry   [nact]     export-ask-user-last-format
- export-folder-uri = file:///home/pierre..  [nact]     export-assistant-last-folder-uri
+ export-folder-uri = file:///home/pierre..  [nact]     export-assistant-lfu
  export-format = Ask                        [nact]     export-preferred-format
  icommand-command-chooser                   [nact]     command-command-chooser-wsp
- icommand-folder-uri                        [nact]     command-command-chooser-last-folder-uri
+ icommand-folder-uri                        [nact]     command-command-chooser-lfu
  icommand-legend-dialog = [673,94,474,480]  [nact]     command-legend-wsp
  icommand-working-dir-dialog                [nact]     command-working-dir-chooser-wsp
- icommand-working-dir-uri = file:///home..  [nact]     command-working-dir-chooser-last-folder-uri
+ icommand-working-dir-uri = file:///home..  [nact]     command-working-dir-chooser-lfu
  icons-chooser = [425,124,839,539]          [nact]     item-icon-chooser-wsp
  icons-path = file:///usr/share/icons/hi..  [nact]     item-icon-chooser-last-file-uri
  ienvironment-show-if-running-dialog = [..  [nact]     environment-show-if-running-wsp
- ienvironment-show-if-running-uri = file..  [nact]     environment-show-if-running-last-folder-uri
+ ienvironment-show-if-running-uri = file..  [nact]     environment-show-if-running-lfu
  ienvironment-try-exec-dialog = [327,70,..  [nact]     environment-try-exec-wsp
- ienvironment-try-exec-uri = file:///bin    [nact]     environment-try-exec-last-folder-uri
+ ienvironment-try-exec-uri = file:///bin    [nact]     environment-try-exec-lfu
  ifolders-chooser = [418,86,632,573]        [nact]     folder-chooser-wsp
- ifolders-path = /home/pierre/data/Pictures [nact]     folder-chooser-last-folder-uri
+ ifolders-path = /home/pierre/data/Pictures [nact]     folder-chooser-lfu
  import-ask-user                            [nact]     import-ask-user-wsp
  import-ask-user-last-mode                  [nact]     import-ask-user-last-mode
  import-assistant                           [nact]     import-assistant-wsp
- import-folder-uri                          [nact]     import-assistant-last-folder-uri
+ import-folder-uri                          [nact]     import-assistant-lfu
  import-keep-choice                         [nact]     import-mode-keep-last-choice
  import-mode = NoImport                     [nact]     import-preferred-mode
  io-providers-order = [..]                  [nact]     io-providers-write-order
diff --git a/src/core/na-settings.h b/src/core/na-settings.h
index e34a871..2fc5855 100644
--- a/src/core/na-settings.h
+++ b/src/core/na-settings.h
@@ -99,25 +99,25 @@ GType na_settings_get_type( void );
 #define NA_IPREFS_ASSISTANT_ESC_QUIT			"assistant-esc-quit"
 #define NA_IPREFS_CAPABILITY_ADD_CAPABILITY_WSP	"capability-add-capability-wsp"
 #define NA_IPREFS_COMMAND_CHOOSER_WSP			"command-command-chooser-wsp"
-#define NA_IPREFS_COMMAND_CHOOSER_URI			"command-command-chooser-last-folder-uri"
+#define NA_IPREFS_COMMAND_CHOOSER_URI			"command-command-chooser-lfu"
 #define NA_IPREFS_COMMAND_LEGEND_WSP			"command-legend-wsp"
 #define NA_IPREFS_WORKING_DIR_WSP				"command-working-dir-chooser-wsp"
-#define NA_IPREFS_WORKING_DIR_URI				"command-working-dir-chooser-last-folder-uri"
+#define NA_IPREFS_WORKING_DIR_URI				"command-working-dir-chooser-lfu"
 #define NA_IPREFS_SHOW_IF_RUNNING_WSP			"environment-show-if-running-wsp"
-#define NA_IPREFS_SHOW_IF_RUNNING_URI			"environment-show-if-running-last-folder-uri"
+#define NA_IPREFS_SHOW_IF_RUNNING_URI			"environment-show-if-running-lfu"
 #define NA_IPREFS_TRY_EXEC_WSP					"environment-try-exec-wsp"
-#define NA_IPREFS_TRY_EXEC_URI					"environment-try-exec-last-folder-uri"
+#define NA_IPREFS_TRY_EXEC_URI					"environment-try-exec-lfu"
 #define NA_IPREFS_EXPORT_ASK_USER_WSP			"export-ask-user-wsp"
 #define NA_IPREFS_EXPORT_ASK_USER_LAST_FORMAT	"export-ask-user-last-format"
 #define NA_IPREFS_EXPORT_ASSISTANT_WSP			"export-assistant-wsp"
-#define NA_IPREFS_EXPORT_ASSISTANT_URI			"export-assistant-last-folder-uri"
+#define NA_IPREFS_EXPORT_ASSISTANT_URI			"export-assistant-lfu"
 #define NA_IPREFS_EXPORT_PREFERRED_FORMAT		"export-preferred-format"
 #define NA_IPREFS_FOLDER_CHOOSER_WSP			"folder-chooser-wsp"
-#define NA_IPREFS_FOLDER_CHOOSER_URI			"folder-chooser-last-folder-uri"
+#define NA_IPREFS_FOLDER_CHOOSER_URI			"folder-chooser-lfu"
 #define NA_IPREFS_IMPORT_ASK_USER_WSP			"import-ask-user-wsp"
 #define NA_IPREFS_IMPORT_ASK_USER_LAST_MODE		"import-ask-user-last-mode"
 #define NA_IPREFS_IMPORT_ASSISTANT_WSP			"import-assistant-wsp"
-#define NA_IPREFS_IMPORT_ASSISTANT_URI			"import-assistant-last-folder-uri"
+#define NA_IPREFS_IMPORT_ASSISTANT_URI			"import-assistant-lfu"
 #define NA_IPREFS_IMPORT_MODE_KEEP_LAST_CHOICE	"import-mode-keep-last-choice"
 #define NA_IPREFS_IMPORT_PREFERRED_MODE			"import-preferred-mode"
 #define NA_IPREFS_ICON_CHOOSER_URI				"item-icon-chooser-last-file-uri"
diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in
index bdb9bbc..22de29b 100644
--- a/src/utils/na-gconf2key.sh.in
+++ b/src/utils/na-gconf2key.sh.in
@@ -467,7 +467,7 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "${key}" str "${value}"
 			;;
 		export-folder-uri)
-			add_pref "nact" "export-assistant-last-folder-uri" str "${value}"
+			add_pref "nact" "export-assistant-lfu" str "${value}"
 			;;
 		export-format)
 			add_pref "nact" "export-preferred-format" str "${value}"
@@ -476,7 +476,7 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "command-command-chooser-wsp" list "${value}"
 			;;
 		icommand-folder-uri)
-			add_pref "nact" "command-command-chooser-last-folder-uri" list "${value}"
+			add_pref "nact" "command-command-chooser-lfu" list "${value}"
 			;;
 		icommand-legend-dialog)
 			add_pref "nact" "command-legend-wsp" list "${value}"
@@ -485,7 +485,7 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "command-working-dir-chooser-wsp" list "${value}"
 			;;
 		icommand-working-dir-uri)
-			add_pref "nact" "command-working-dir-chooser-last-folder-uri" str "${value}"
+			add_pref "nact" "command-working-dir-chooser-lfu" str "${value}"
 			;;
 		icons-chooser)
 			add_pref "nact" "item-icon-chooser-wsp" list "${value}"
@@ -497,19 +497,19 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "environment-show-if-running-wsp" list "${value}"
 			;;
 		ienvironment-show-if-running-uri)
-			add_pref "nact" "environment-show-if-running-last-folder-uri" str "${value}"
+			add_pref "nact" "environment-show-if-running-lfu" str "${value}"
 			;;
 		ienvironment-try-exec-dialog)
 			add_pref "nact" "environment-try-exec-wsp" list "${value}"
 			;;
 		ienvironment-try-exec-uri)
-			add_pref "nact" "environment-try-exec-last-folder-uri" str "${value}"
+			add_pref "nact" "environment-try-exec-lfu" str "${value}"
 			;;
 		ifolders-chooser)
 			add_pref "nact" "folder-chooser-wsp" list "${value}"
 			;;
 		ifolders-path)
-			add_pref "nact" "folder-chooser-last-folder-uri" str "file://${value}"
+			add_pref "nact" "folder-chooser-lfu" str "file://${value}"
 			;;
 		import-ask-user)
 			add_pref "nact" "import-ask-user-wsp" list "${value}"
@@ -521,7 +521,7 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "import-assistant-wsp" list "${value}"
 			;;
 		import-folder-uri)
-			add_pref "nact" "import-assistant-last-folder-uri" str "${value}"
+			add_pref "nact" "import-assistant-lfu" str "${value}"
 			;;
 		import-keep-choice)
 			add_pref "nact" "import-mode-keep-last-choice" list "${value}"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]