Sophie

Sophie

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

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

diff -p -up lxlauncher-0.2/configure.in~ lxlauncher-0.2/configure.in
--- lxlauncher-0.2/configure.in~	2008-06-15 16:09:45.000000000 +0200
+++ lxlauncher-0.2/configure.in	2008-11-17 23:00:35.000000000 +0100
@@ -15,6 +15,11 @@ PKG_CHECK_MODULES(GTK, [$gtk_modules])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+gconf_modules="gconf-2.0"
+PKG_CHECK_MODULES(GCONF, [$gconf_modules])
+AC_SUBST(GCONF_CFLAGS)
+AC_SUBST(GCONF_LIBS)
+
 sn_modules="libstartup-notification-1.0"
 PKG_CHECK_MODULES(SN, [$sn_modules])
 AC_SUBST(SN_CFLAGS)
diff -p -up lxlauncher-0.2/src/Makefile.am~ lxlauncher-0.2/src/Makefile.am
--- lxlauncher-0.2/src/Makefile.am~	2008-11-17 22:46:10.000000000 +0100
+++ lxlauncher-0.2/src/Makefile.am	2008-11-17 23:00:01.000000000 +0100
@@ -4,7 +4,7 @@ INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
-	@GTK_CFLAGS@ @SN_CFLAGS@ @GMENU_CFLAGS@
+	@GTK_CFLAGS@ @GCONF_CFLAGS@ @SN_CFLAGS@ @GMENU_CFLAGS@
 
 bin_PROGRAMS = lxlauncher
 
@@ -17,5 +17,5 @@ lxlauncher_SOURCES = \
 	working-area.c working-area.h \
 	exo-wrap-table.c exo-wrap-table.h
 
-lxlauncher_LDADD = @GTK_LIBS@ @SN_LIBS@ @GMENU_LIBS@ $(INTLLIBS)
+lxlauncher_LDADD = @GTK_LIBS@ @GCONF_LIBS@ @SN_LIBS@ @GMENU_LIBS@ $(INTLLIBS)
 
diff -p -up lxlauncher-0.2/src/lxlauncher.c~ lxlauncher-0.2/src/lxlauncher.c
--- lxlauncher-0.2/src/lxlauncher.c~	2008-11-17 23:14:48.000000000 +0100
+++ lxlauncher-0.2/src/lxlauncher.c	2008-11-17 23:15:29.000000000 +0100
@@ -32,6 +32,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <gconf/gconf-client.h>
+
 #define GMENU_I_KNOW_THIS_IS_UNSTABLE
 #include <gmenu-tree.h>
 
@@ -49,6 +51,8 @@
 #define BACKGROUND_DIR  PACKAGE_DATA_DIR"/lxlauncher/background"
 #define ICON_DIR        PACKAGE_DATA_DIR"/lxlauncher/icons"
 
+#define LXLAUNCHER_CONF "/apps/lxlauncher/"
+
 static GtkWidget* main_window;
 static GtkWidget* notebook;
 static GtkTooltips* tooltips;
@@ -70,6 +74,8 @@ typedef struct _PageData{
 	GdkPixbuf* background;
 }PageData;
 
+static GConfClient *gconf_client;
+
 static void on_app_btn_clicked( GtkButton* btn, GMenuTreeEntry* app )
 {
 	lxlauncher_execute_app( gdk_screen_get_default(),
@@ -621,6 +627,7 @@ int main(int argc, char** argv)
 #endif
 
 	gtk_init( &argc, &argv );
+	gconf_client = gconf_client_get_default();
 
 	GtkIconTheme* theme = gtk_icon_theme_get_default();
 	gtk_icon_theme_prepend_search_path(theme, "/usr/share/icons/large");