[nautilus-actions] Fix regression in GConf configuration migration

[Pierre Wieser <pwieser src gnome org>]

commit 99e4dbf14fd64e24cca86497e97fd52706ef19d0
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Dec 9 19:51:03 2011 +0100

    Fix regression in GConf configuration migration

 ChangeLog                     |    5 +++++
 src/core/na-gconf-migration.c |    2 +-
 src/utils/na-gconf2key.sh.in  |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a097420..f68f60c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-12-09 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/na-gconf-migration.c (na_gconf_migration_run):
+	Run verbosely.
+
+	* src/utils/na-gconf2key.sh.in: Fix unset variable.
+
 	* src/nact/nact-match-list.c (insert_new_row):
 	New rows now default to be 'matched'.
 
diff --git a/src/core/na-gconf-migration.c b/src/core/na-gconf-migration.c
index 9b55e7e..f54e531 100644
--- a/src/core/na-gconf-migration.c
+++ b/src/core/na-gconf-migration.c
@@ -34,7 +34,7 @@
 
 #include "na-gconf-migration.h"
 
-#define MIGRATION_COMMAND				PKGLIBEXECDIR "/na-gconf2key.sh -delete -nodummy"
+#define MIGRATION_COMMAND				PKGLIBEXECDIR "/na-gconf2key.sh -delete -nodummy -verbose"
 
 /**
  * na_gconf_migration_run:
diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in
index 765680c..1a5cdde 100644
--- a/src/utils/na-gconf2key.sh.in
+++ b/src/utils/na-gconf2key.sh.in
@@ -440,7 +440,7 @@ msg "${nbitems} migrated items"
 # while user preferences go to HOME/.config/nautilus-actions/nautilus-actions.conf
 # Note also that the GConf I/O provider will be disabled for writings
 # after this migration
-destdir=${destdir}/@PACKAGE@
+destdir=${conf_dir}/@PACKAGE@
 command "mkdir -m ${dir_mode} -p ${destdir}"
 destconf=${destdir}/@PACKAGE  conf
 rm -f ${my_tmproot}.nact