rpms/lxde-settings-daemon/F-11 lxde-settings-daemon-0.4.1-fix-load-sysconfdir-config.patch, NONE, 1.1

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27055/F-11

Added Files:
	lxde-settings-daemon-0.4.1-fix-load-sysconfdir-config.patch 
Log Message:
add missing patch

lxde-settings-daemon-0.4.1-fix-load-sysconfdir-config.patch:
 Makefile.am            |    3 ++-
 Makefile.in            |    3 ++-
 lxde-settings-daemon.c |    8 +++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE lxde-settings-daemon-0.4.1-fix-load-sysconfdir-config.patch ---
--- lxde-settings-daemon-0.4.1/src/lxde-settings-daemon.c	2009-04-28 19:19:26.000000000 +0200
+++ lxde-settings-daemon-0.4.1/src/lxde-settings-daemon.c	2009-07-08 23:10:52.000000000 +0200
@@ -159,7 +159,13 @@
 	g_free( file );
 
 	if( ! ret )
-		ret = g_key_file_load_from_file( kf, PACKAGE_DATA_DIR"/config", 0, NULL );
+	{	
+		/* FIX by Massimo Cavalleri (submax)
+		   PACKAGE_CONFIG_DIR=$(sysconfdir)/lxde and sysconfdir=/etc */
+		file = g_build_filename( PACKAGE_CONFIG_DIR, "config", NULL );
+		ret = g_key_file_load_from_file( kf, file, 0, NULL );
+		g_free( file );
+	}
 
 	if( ret )
 	{
--- lxde-settings-daemon-0.4.1/src/Makefile.am	2009-04-14 19:39:21.000000000 +0200
+++ lxde-settings-daemon-0.4.1/src/Makefile.am	2009-07-08 23:11:53.000000000 +0200
@@ -2,7 +2,8 @@
 
 lxde_settings_daemon_CFLAGS = $(GLIB_CFLAGS) \
                    -DPACKAGE_DATA_DIR=\""$(datadir)/lxde"\" \
-                   -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"
+                   -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
+                   -DPACKAGE_CONFIG_DIR=\""$(sysconfdir)/lxde"\"
 
 lxde_settings_daemon_LDADD = $(GLIB_LIBS) -lX11
 
--- lxde-settings-daemon-0.4.1/src/Makefile.in	2009-05-05 15:48:31.000000000 +0200
+++ lxde-settings-daemon-0.4.1/src/Makefile.in	2009-07-08 23:12:23.000000000 +0200
@@ -157,7 +157,8 @@
 top_srcdir = @top_srcdir@
 lxde_settings_daemon_CFLAGS = $(GLIB_CFLAGS) \
                    -DPACKAGE_DATA_DIR=\""$(datadir)/lxde"\" \
-                   -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"
+                   -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
+                   -DPACKAGE_CONFIG_DIR=\""$(sysconfdir)/lxde"\"
 
 lxde_settings_daemon_LDADD = $(GLIB_LIBS) -lX11
 lxde_settings_daemon_SOURCES = \