[nautilus-actions] Adjust new preference names

[Pierre Wieser <pwieser src gnome org>]

commit 395b58d6cc51472ab8fabccdb391b19131e3dd78
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Jan 13 17:37:06 2011 +0100

    Adjust new preference names
    
    + 'export-folder-uri' is renamed as 'export-assistant-last-folder-uri'
    + 'ifolders-path' is renamed as 'folder-chooser-last-folder-uri'
    + 'import-folder-uri' is renamed as 'import-assistant-last-folder-uri'
    + 'io-providers-order' is no more duplicated.

 ChangeLog                    |    3 +++
 README-GCONF                 |    7 +++----
 src/utils/na-gconf2key.sh.in |    7 +++----
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d54086b..9086b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,9 @@
 
 2011-01-13 Pierre Wieser <pwieser trychlos org>
 
+	* README-GCONF:
+	* src/utils/na-gconf2key.sh.in: Adjust preferences.
+
 	* src/core/na-iprefs.c:
 	* src/core/na-iprefs.h: NAIPrefs is no more an interface.
 
diff --git a/README-GCONF b/README-GCONF
index f48e0e6..4e3a2eb 100644
--- a/README-GCONF
+++ b/README-GCONF
@@ -73,7 +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
- export-folder-uri = file:///home/pierre..  [nact]     export-last-folder-uri
+ export-folder-uri = file:///home/pierre..  [nact]     export-assistant-last-folder-uri
  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
@@ -87,14 +87,13 @@ Deprecating GConf
  ienvironment-try-exec-dialog = [327,70,..  [nact]     environment-try-exec-wsp
  ienvironment-try-exec-uri = file:///bin    [nact]     environment-try-exec-last-folder-uri
  ifolders-chooser = [418,86,632,573]        [nact]     folder-chooser-wsp
- ifolders-path = /home/pierre/data/Pictures [nact]     folder-last-folder-uri
+ ifolders-path = /home/pierre/data/Pictures [nact]     folder-chooser-last-folder-uri
  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-last-folder-uri
+ import-folder-uri                          [nact]     import-assistant-last-folder-uri
  import-keep-choice                         [nact]     import-mode-keep-last-choice
  import-mode = NoImport                     [nact]     import-preferred-mode
- io-providers-order = [..]                  [runtime]  io-providers-read-order
  io-providers-order = [..]                  [nact]     io-providers-write-order
  iprefs-add-about-item = true               [runtime]  items-add-about-item
  iprefs-alphabetical-order = ManualOrder    [runtime]  items-list-order-mode
diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in
index b81b1ca..89055c4 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-last-folder-uri" str "${value}"
+			add_pref "nact" "export-assistant-last-folder-uri" str "${value}"
 			;;
 		export-format)
 			add_pref "nact" "export-preferred-format" str "${value}"
@@ -509,7 +509,7 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "folder-chooser-wsp" list "${value}"
 			;;
 		ifolders-path)
-			add_pref "nact" "folder-last-folder-uri" str "file://${value}"
+			add_pref "nact" "folder-chooser-last-folder-uri" 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-last-folder-uri" str "${value}"
+			add_pref "nact" "import-assistant-last-folder-uri" str "${value}"
 			;;
 		import-keep-choice)
 			add_pref "nact" "import-mode-keep-last-choice" list "${value}"
@@ -530,7 +530,6 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "import-preferred-mode" str "${value}"
 			;;
 		io-providers-order)
-			add_pref "runtime" "io-providers-read-order" list "${value}"
 			add_pref "nact" "io-providers-write-order" list "${value}"
 			;;
 		iprefs-add-about-item)