GNOME.org
 

[nautilus-actions] Rename 'import-mode-keep-last-choice' as 'import-ask-user-keep-last-choice'

commit f1ad1df64214fa1feb0dcfeb05cc0e860ece236d
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jan 19 00:11:26 2011 +0100

    Rename 'import-mode-keep-last-choice' as 'import-ask-user-keep-last-choice'

 ChangeLog                    |    5 ++
 README-GCONF                 |    5 +-
 src/core/na-settings.h       |  117 +++++++++++++++++++++---------------------
 src/utils/na-gconf2key.sh.in |    2 +-
 4 files changed, 68 insertions(+), 61 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fdc54f0..f0b86b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
 
 	* NEWS: Update before release.
 
+	* README-GCONF:
+	* src/core/na-settings.h:
+	* src/utils/na-gconf2key.sh.in:
+	Rename 'import-mode-keep-last-choice' as 'import-ask-user-keep-last-choice'.
+
 2011-01-17 Pierre Wieser <pwieser trychlos org>
 
 	* src/nact/nact-preferences-editor.c:
diff --git a/README-GCONF b/README-GCONF
index 7fbefaf..5c53611 100644
--- a/README-GCONF
+++ b/README-GCONF
@@ -73,6 +73,7 @@ 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
+                                            [nact]     export-ask-user-keep-last-choice
  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
@@ -92,7 +93,7 @@ Deprecating GConf
  import-ask-user-last-mode                  [nact]     import-ask-user-last-mode
  import-assistant                           [nact]     import-assistant-wsp
  import-folder-uri                          [nact]     import-assistant-lfu
- import-keep-choice                         [nact]     import-mode-keep-last-choice
+ import-keep-choice                         [nact]     import-ask-user-keep-last-choice
  import-mode = NoImport                     [nact]     import-preferred-mode
  io-providers-order = [..]                  [nact]     io-providers-write-order
  iprefs-add-about-item = true               [runtime]  items-add-about-item
@@ -137,7 +138,7 @@ Deprecating GConf
  GConf                                      Group      Key
  -----------------------------------------  ------     --------------------------------------
  /apps/nautilus-actions/mandatory/all/locked
-                                            [runtime]  preferences-locked
+                                            [nact]     preferences-locked
                                             [runtime]  io-providers-locked
 
  /apps/nautilus-actions/mandatory/na-desktop/locked    <removed>
diff --git a/src/core/na-settings.h b/src/core/na-settings.h
index 47eb156..ac0fe1b 100644
--- a/src/core/na-settings.h
+++ b/src/core/na-settings.h
@@ -85,67 +85,68 @@ GType na_settings_get_type( void );
  * have an impact on the order or the display of items in the file manager
  * context menus
  */
-#define NA_IPREFS_IO_PROVIDERS_READ_STATUS		"io-providers-read-status-composite-key"
-#define NA_IPREFS_ITEMS_ADD_ABOUT_ITEM			"items-add-about-item"
-#define NA_IPREFS_ITEMS_CREATE_ROOT_MENU		"items-create-root-menu"
-#define NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER		"items-level-zero-order"
-#define NA_IPREFS_ITEMS_LIST_ORDER_MODE			"items-list-order-mode"
+#define NA_IPREFS_IO_PROVIDERS_READ_STATUS			"io-providers-read-status-composite-key"
+#define NA_IPREFS_ITEMS_ADD_ABOUT_ITEM				"items-add-about-item"
+#define NA_IPREFS_ITEMS_CREATE_ROOT_MENU			"items-create-root-menu"
+#define NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER			"items-level-zero-order"
+#define NA_IPREFS_ITEMS_LIST_ORDER_MODE				"items-list-order-mode"
 
 /* other keys, mainly user preferences
  */
-#define NA_IPREFS_ADMIN_PREFERENCES_LOCKED		"preferences-locked"
-#define NA_IPREFS_ADMIN_IO_PROVIDERS_LOCKED		"io-providers-locked"
-#define NA_IPREFS_ASSISTANT_ESC_CONFIRM			"assistant-esc-confirm"
-#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-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-lfu"
-#define NA_IPREFS_SHOW_IF_RUNNING_WSP			"environment-show-if-running-wsp"
-#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-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-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-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-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-lfu"
-#define NA_IPREFS_ICON_CHOOSER_PANED			"item-icon-chooser-paned-width"
-#define NA_IPREFS_ICON_CHOOSER_WSP				"item-icon-chooser-wsp"
-#define NA_IPREFS_IO_PROVIDERS_WRITE_ORDER		"io-providers-write-order"
-#define NA_IPREFS_MAIN_PANED					"main-paned-width"
-#define NA_IPREFS_MAIN_SAVE_AUTO				"main-save-auto"
-#define NA_IPREFS_MAIN_SAVE_PERIOD				"main-save-period"
-#define NA_IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY		"main-toolbar-edit-display"
-#define NA_IPREFS_MAIN_TOOLBAR_FILE_DISPLAY		"main-toolbar-file-display"
-#define NA_IPREFS_MAIN_TOOLBAR_HELP_DISPLAY		"main-toolbar-help-display"
-#define NA_IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY	"main-toolbar-tools-display"
-#define NA_IPREFS_MAIN_WINDOW_WSP				"main-window-wsp"
-#define NA_IPREFS_PREFERENCES_WSP				"preferences-wsp"
-#define NA_IPREFS_RELABEL_DUPLICATE_ACTION		"relabel-when-duplicate-action"
-#define NA_IPREFS_RELABEL_DUPLICATE_MENU		"relabel-when-duplicate-menu"
-#define NA_IPREFS_RELABEL_DUPLICATE_PROFILE		"relabel-when-duplicate-profile"
-#define NA_IPREFS_SCHEME_ADD_SCHEME_WSP			"scheme-add-scheme-wsp"
-#define NA_IPREFS_SCHEME_DEFAULT_LIST			"scheme-default-list"
-
-#define NA_IPREFS_IO_PROVIDER_GROUP				"io-provider"
-#define NA_IPREFS_IO_PROVIDER_READABLE			"readable"
-#define NA_IPREFS_IO_PROVIDER_WRITABLE			"writable"
-
-#define NA_IPREFS_DEFAULT_EXPORT_FORMAT			"Desktop1"
-#define NA_IPREFS_DEFAULT_IMPORT_MODE			"NoImport"
-#define NA_IPREFS_DEFAULT_LIST_ORDER_MODE		"AscendingOrder"
+#define NA_IPREFS_ADMIN_PREFERENCES_LOCKED			"preferences-locked"
+#define NA_IPREFS_ADMIN_IO_PROVIDERS_LOCKED			"io-providers-locked"
+#define NA_IPREFS_ASSISTANT_ESC_CONFIRM				"assistant-esc-confirm"
+#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-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-lfu"
+#define NA_IPREFS_SHOW_IF_RUNNING_WSP				"environment-show-if-running-wsp"
+#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-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_ASK_USER_KEEP_LAST_CHOICE	"export-ask-user-keep-last-choice"
+#define NA_IPREFS_EXPORT_ASSISTANT_WSP				"export-assistant-wsp"
+#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-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-lfu"
+#define NA_IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE	"import-ask-user-keep-last-choice"
+#define NA_IPREFS_IMPORT_PREFERRED_MODE				"import-preferred-mode"
+#define NA_IPREFS_ICON_CHOOSER_URI					"item-icon-chooser-lfu"
+#define NA_IPREFS_ICON_CHOOSER_PANED				"item-icon-chooser-paned-width"
+#define NA_IPREFS_ICON_CHOOSER_WSP					"item-icon-chooser-wsp"
+#define NA_IPREFS_IO_PROVIDERS_WRITE_ORDER			"io-providers-write-order"
+#define NA_IPREFS_MAIN_PANED						"main-paned-width"
+#define NA_IPREFS_MAIN_SAVE_AUTO					"main-save-auto"
+#define NA_IPREFS_MAIN_SAVE_PERIOD					"main-save-period"
+#define NA_IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY			"main-toolbar-edit-display"
+#define NA_IPREFS_MAIN_TOOLBAR_FILE_DISPLAY			"main-toolbar-file-display"
+#define NA_IPREFS_MAIN_TOOLBAR_HELP_DISPLAY			"main-toolbar-help-display"
+#define NA_IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY		"main-toolbar-tools-display"
+#define NA_IPREFS_MAIN_WINDOW_WSP					"main-window-wsp"
+#define NA_IPREFS_PREFERENCES_WSP					"preferences-wsp"
+#define NA_IPREFS_RELABEL_DUPLICATE_ACTION			"relabel-when-duplicate-action"
+#define NA_IPREFS_RELABEL_DUPLICATE_MENU			"relabel-when-duplicate-menu"
+#define NA_IPREFS_RELABEL_DUPLICATE_PROFILE			"relabel-when-duplicate-profile"
+#define NA_IPREFS_SCHEME_ADD_SCHEME_WSP				"scheme-add-scheme-wsp"
+#define NA_IPREFS_SCHEME_DEFAULT_LIST				"scheme-default-list"
+
+#define NA_IPREFS_IO_PROVIDER_GROUP					"io-provider"
+#define NA_IPREFS_IO_PROVIDER_READABLE				"readable"
+#define NA_IPREFS_IO_PROVIDER_WRITABLE				"writable"
+
+#define NA_IPREFS_DEFAULT_EXPORT_FORMAT				"Desktop1"
+#define NA_IPREFS_DEFAULT_IMPORT_MODE				"NoImport"
+#define NA_IPREFS_DEFAULT_LIST_ORDER_MODE			"AscendingOrder"
 
 typedef void ( *NASettingsKeyCallback )( const gchar *group, const gchar *key, gconstpointer new_value, gboolean mandatory, void *user_data );
 
diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in
index 00929fa..27a4e44 100644
--- a/src/utils/na-gconf2key.sh.in
+++ b/src/utils/na-gconf2key.sh.in
@@ -524,7 +524,7 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "import-assistant-lfu" str "${value}"
 			;;
 		import-keep-choice)
-			add_pref "nact" "import-mode-keep-last-choice" list "${value}"
+			add_pref "nact" "import-ask-user-keep-last-choice" list "${value}"
 			;;
 		import-mode)
 			add_pref "nact" "import-preferred-mode" str "${value}"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]