Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 9ec37d859a7713de62bd171a0fde787a > files > 9

lxlauncher-0.2.1-3mdv2010.1.src.rpm

diff -p -up lxlauncher-0.2/src/Makefile.am.sysconf lxlauncher-0.2/src/Makefile.am
--- lxlauncher-0.2/src/Makefile.am.sysconf	2008-06-15 17:15:41.000000000 +0200
+++ lxlauncher-0.2/src/Makefile.am	2008-09-29 20:32:05.000000000 +0200
@@ -3,6 +3,7 @@
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	@GTK_CFLAGS@ @SN_CFLAGS@ @GMENU_CFLAGS@
 
 bin_PROGRAMS = lxlauncher
diff -p -up lxlauncher-0.2/src/lxlauncher.c.sysconf lxlauncher-0.2/src/lxlauncher.c
--- lxlauncher-0.2/src/lxlauncher.c.sysconf	2008-09-29 20:22:35.000000000 +0200
+++ lxlauncher-0.2/src/lxlauncher.c	2008-09-29 20:36:50.000000000 +0200
@@ -616,7 +616,11 @@ int main(int argc, char** argv)
 	gtk_init( &argc, &argv );
 
     // set up themes for notebook
-    gtk_rc_parse( PACKAGE_DATA_DIR "/lxlauncher/gtkrc" );
+	if (g_file_test(PACKAGE_SYSCONF_DIR "/lxlauncher/gtkrc", G_FILE_TEST_EXISTS)) { 
+	  gtk_rc_parse( PACKAGE_SYSCONF_DIR "/lxlauncher/gtkrc" );
+	} else {
+	  gtk_rc_parse( PACKAGE_DATA_DIR "/lxlauncher/gtkrc" );
+	}
 
 	icon_size = gtk_icon_size_register( "ALIcon", IMG_SIZE, IMG_SIZE );
 
@@ -645,7 +649,11 @@ int main(int argc, char** argv)
 	tooltips = gtk_tooltips_new();
 	g_object_ref_sink( tooltips );
 
-    menu_tree = gmenu_tree_lookup( DATA_DIR"/launcher.menu", GMENU_TREE_FLAGS_NONE );
+	if (g_file_test(PACKAGE_SYSCONF_DIR "/lxlauncher/launcher.menu", G_FILE_TEST_EXISTS)) { 
+	  menu_tree = gmenu_tree_lookup( PACKAGE_SYSCONF_DIR "/lxlauncher/launcher.menu", GMENU_TREE_FLAGS_NONE );
+	} else {
+	  menu_tree = gmenu_tree_lookup( DATA_DIR"/launcher.menu", GMENU_TREE_FLAGS_NONE );
+	}
     gmenu_tree_add_monitor( menu_tree, on_menu_tree_changed, NULL );
 
     create_notebook_pages();