[nautilus-actions] Move Nautilus-Actions configuration files to nautilus-actions/ subdir

[Pierre Wieser <pwieser src gnome org>]

commit b2b976a56e464c5f221325c1b0db89966228c26b
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Feb 23 22:14:48 2011 +0100

    Move Nautilus-Actions configuration files to nautilus-actions/ subdir

 ChangeLog                    |    5 +++++
 src/core/na-settings.c       |    4 ++--
 src/utils/na-gconf2key.sh.in |    1 +
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 04787c2..34914f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-23 Pierre Wieser <pwieser trychlos org>
 
+	Move Nautilus-Actions configuration files to nautilus-actions/ subdir
+
+	* src/core/na-settings.c (na_settings_new):
+	* src/utils/na-gconf2key.sh.in: Updated accordingly.
+
 	Implement execution mode property
 
 	* m4/na-check-for-gtk.m4: Check for Gio-unix.
diff --git a/src/core/na-settings.c b/src/core/na-settings.c
index 23a1540..6a044e2 100644
--- a/src/core/na-settings.c
+++ b/src/core/na-settings.c
@@ -384,12 +384,12 @@ na_settings_new( void )
 
 	settings = g_object_new( NA_SETTINGS_TYPE, NULL );
 
-	dir = g_build_filename( SYSCONFDIR, "xdg", NULL );
+	dir = g_build_filename( SYSCONFDIR, "xdg", PACKAGE, NULL );
 	g_debug( "%s: reading mandatory configuration", thisfn );
 	settings->private->mandatory = key_file_new( settings, dir );
 	g_free( dir );
 
-	dir = g_build_filename( g_get_home_dir(), ".config", NULL );
+	dir = g_build_filename( g_get_home_dir(), ".config", PACKAGE, NULL );
 	g_debug( "%s: reading user configuration", thisfn );
 	settings->private->user = key_file_new( settings, dir );
 	g_free( dir );
diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in
index 44e6528..652df0e 100644
--- a/src/utils/na-gconf2key.sh.in
+++ b/src/utils/na-gconf2key.sh.in
@@ -431,6 +431,7 @@ msg "${nbitems} migrated items"
 # Note also that the GConf I/O provider is disabled both for reading
 # and writing
 [ $(id -u) -eq 0 ] && destdir= sysconfdir@/xdg || destdir=${HOME}/.config
+destdir=${destdir}/@PACKAGE@
 command "mkdir -p ${destdir}"
 destconf=${destdir}/@PACKAGE  conf
 rm -f ${my_tmproot}.nact