SF.net SVN: geany:[5372] trunk

[eht16 at users.sourceforge.net]

Revision: 5372
          http://geany.svn.sourceforge.net/geany/?rev=5372&view=rev
Author:   eht16
Date:     2010-11-07 13:48:10 +0000 (Sun, 07 Nov 2010)

Log Message:
-----------
Fix build with GTK 2.12: explicitly include gio.h if GIO is available and to be used regardless of the USE_GIO_FILEMON flag.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/document.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-11-07 13:13:05 UTC (rev 5371)
+++ trunk/ChangeLog	2010-11-07 13:48:10 UTC (rev 5372)
@@ -1,3 +1,10 @@
+2010-11-06  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/document.c:
+   Fix build with GTK 2.12: explicitly include gio.h if GIO
+   is available and to be used regardless of the USE_GIO_FILEMON flag.
+
+
 2010-11-07  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/document.c:

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2010-11-07 13:13:05 UTC (rev 5371)
+++ trunk/src/document.c	2010-11-07 13:48:10 UTC (rev 5372)
@@ -48,10 +48,10 @@
 
 /* uncomment to use GIO based file monitoring, though it is not completely stable yet */
 /*#define USE_GIO_FILEMON 1*/
-#if USE_GIO_FILEMON
-# ifdef HAVE_GIO
-#  include <gio/gio.h>
-# else
+#ifdef HAVE_GIO
+# include <gio/gio.h>
+#else
+# if USE_GIO_FILEMON
 #  undef USE_GIO_FILEMON
 # endif
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.