[nautilus-actions] Fix two key label conversions

[Pierre Wieser <pwieser src gnome org>]

commit 7c8254a4c5ae2b5363eea019d6bdea3e0376a58c
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jan 12 01:34:44 2011 +0100

    Fix two key label conversions
    
    GConf 'export-assistant' is renamed as 'export-assistant-dialog-size'
    GConf 'ienvironment-try-exec-uri' is renamed as 'environment-try-exec-last-folder-uri'.

 ChangeLog                    |    3 +++
 README-GCONF                 |    4 ++--
 src/utils/na-gconf2key.sh.in |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 158edb2..819da68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
 
 	* configure.ac: Enable silent rules by default.
 
+	* README-GCONF:
+	* src/utils/na-gconf2key.sh.in: Fix two key label conversions.
+
 	* src/api/na-boxed.h:
 	* src/core/na-boxed.c: New files.
 
diff --git a/README-GCONF b/README-GCONF
index 9f3dd33..9e97c2e 100644
--- a/README-GCONF
+++ b/README-GCONF
@@ -70,7 +70,7 @@ Deprecating GConf
  assistant-esc-quit = true                  [nact]     assistant-esc-quit
  auto-save-on = false                       [nact]     main-save-auto
  auto-save-period = 5                       [nact]     main-save-period
- export-assistant = [377,33,699,675]        [nact]     assistant-dialog-size
+ export-assistant = [377,33,699,675]        [nact]     export-assistant-dialog-size
  export-folder-uri = file:///home/pierre..  [nact]     export-last-folder-uri
  export-format = Ask                        [nact]     export-preferred-format
  icommand-command-chooser                   [nact]     command-command-chooser-dialog-size
@@ -83,7 +83,7 @@ Deprecating GConf
  ienvironment-show-if-running-dialog = [..  [nact]     environment-show-if-running-dialog-size
  ienvironment-show-if-running-uri = file..  [nact]     environment-show-if-running-last-folder-uri
  ienvironment-try-exec-dialog = [327,70,..  [nact]     environment-try-exec-dialog-size
- ienvironment-try-exec-uri = file:///bin    [nact]     environment-show-if-running-last-folder-uri
+ ienvironment-try-exec-uri = file:///bin    [nact]     environment-try-exec-last-folder-uri
  ifolders-chooser = [418,86,632,573]        [nact]     folder-chooser-dialog-size
  ifolders-path = /home/pierre/data/Pictures [nact]     folder-last-path
  import-ask-user                            [nact]     import-ask-user-dialog-size
diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in
index c8db9d1..51a8e53 100644
--- a/src/utils/na-gconf2key.sh.in
+++ b/src/utils/na-gconf2key.sh.in
@@ -458,7 +458,7 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "main-save-period" str "${value}"
 			;;
 		export-assistant)
-			add_pref "nact" "assistant-dialog-size" list "${value}"
+			add_pref "nact" "export-assistant-dialog-size" list "${value}"
 			;;
 		export-folder-uri)
 			add_pref "nact" "export-last-folder-uri" str "${value}"
@@ -497,7 +497,7 @@ gconftool-2 --all-entries ${na_preferences} | while read key x value; do
 			add_pref "nact" "environment-try-exec-dialog-size" list "${value}"
 			;;
 		ienvironment-try-exec-uri)
-			add_pref "nact" "environment-show-if-running-last-folder-uri" str "${value}"
+			add_pref "nact" "environment-try-exec-last-folder-uri" str "${value}"
 			;;
 		ifolders-chooser)
 			add_pref "nact" "folder-chooser-dialog-size" list "${value}"