Author: al
Date: 2010-05-28 18:13:59 +0200 (Fri, 28 May 2010)
New Revision: 3400
Modified:
trunk/src/Makefile.am
trunk/src/application.c
Log:
Fixed misuse of WIN32 define. Changed to WITH_GCONF define check.
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-05-28 14:52:07 UTC (rev 3399)
+++ trunk/src/Makefile.am 2010-05-28 16:13:59 UTC (rev 3400)
@@ -9,6 +9,7 @@
AM_CFLAGS =\
-Wall -fno-strict-aliasing\
+ -DWITH_GCONF\
-O4
AM_CXXFLAGS = $(AM_CFLAGS)
Modified: trunk/src/application.c
===================================================================
--- trunk/src/application.c 2010-05-28 14:52:07 UTC (rev 3399)
+++ trunk/src/application.c 2010-05-28 16:13:59 UTC (rev 3400)
@@ -29,7 +29,7 @@
#include <string.h> /* memset() */
#include <time.h>
#include <config.h>
-#ifndef WIN32
+#ifdef WITH_GCONF
#include <gconf/gconf-client.h>
#endif
#if defined(RS_USE_INTERNAL_STACKTRACE)
@@ -700,7 +700,7 @@
sigaction(SIGILL, &sa, NULL);
#endif
-#ifndef WIN32
+#ifdef WITH_GCONF
GConfClient *client;
#endif
@@ -740,7 +740,7 @@
rs_plugin_manager_load_all_plugins();
-#ifndef WIN32
+#ifdef WITH_GCONF
/* Add our own directory to default GConfClient before anyone uses it */
client = gconf_client_get_default();
gconf_client_add_dir(client, "/apps/" PACKAGE,
GCONF_CLIENT_PRELOAD_NONE, NULL);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
