SF.net SVN: geany:[5852] trunk

[colombanw at users.sourceforge.net]

Revision: 5852
          http://geany.svn.sourceforge.net/geany/?rev=5852&view=rev
Author:   colombanw
Date:     2011-06-17 22:51:17 +0000 (Fri, 17 Jun 2011)

Log Message:
-----------
Remove most of the checks for GIO

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/document.c
    trunk/src/main.c
    trunk/src/ui_utils.c
    trunk/src/utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/ChangeLog	2011-06-17 22:51:17 UTC (rev 5852)
@@ -1,3 +1,9 @@
+2011-06-16  Colomban Wendling  <colomban(at)geany(dot)org>
+
+ * src/document.c, src/main.c, src/ui_utils.c, src/utils.c:
+   Remove most of the checks for GIO.
+
+
 2011-06-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * tagmanager/python.c:

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/src/document.c	2011-06-17 22:51:17 UTC (rev 5852)
@@ -48,13 +48,7 @@
 
 /* uncomment to use GIO based file monitoring, though it is not completely stable yet */
 /*#define USE_GIO_FILEMON 1*/
-#ifdef HAVE_GIO
-# include <gio/gio.h>
-#else
-# if USE_GIO_FILEMON
-#  undef USE_GIO_FILEMON
-# endif
-#endif
+#include <gio/gio.h>
 
 #include "document.h"
 #include "documentprivate.h"

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/src/main.c	2011-06-17 22:51:17 UTC (rev 5852)
@@ -96,9 +96,6 @@
 
 
 static const gchar geany_lib_versions[] = "GTK %u.%u.%u, GLib %u.%u.%u"
-#ifdef HAVE_GIO
-	", GIO"
-#endif
 #ifdef USE_INCLUDED_REGEX
 	", built-in regex"
 #endif

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/src/ui_utils.c	2011-06-17 22:51:17 UTC (rev 5852)
@@ -2517,7 +2517,7 @@
 GdkPixbuf *ui_get_mime_icon(const gchar *mime_type, GtkIconSize size)
 {
 	GdkPixbuf *icon = NULL;
-#if defined(HAVE_GIO) && GLIB_CHECK_VERSION(2, 18, 0)
+#if GLIB_CHECK_VERSION(2, 18, 0)
 	gchar *ctype;
 	GIcon *gicon;
 	GtkIconInfo *info;
@@ -2544,7 +2544,7 @@
 		}
 	}
 #endif
-	/* fallback for builds without GIO or if icon lookup failed, like it might happen on Windows */
+	/* fallback for builds with GIO < 2.18 or if icon lookup failed, like it might happen on Windows */
 	if (icon == NULL)
 	{
 		const gchar *stock_id = GTK_STOCK_FILE;

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/src/utils.c	2011-06-17 22:51:17 UTC (rev 5852)
@@ -44,9 +44,7 @@
 
 #include <glib/gstdio.h>
 
-#ifdef HAVE_GIO
-# include <gio/gio.h>
-#endif
+#include <gio/gio.h>
 
 #include "prefs.h"
 #include "support.h"
@@ -1838,7 +1836,6 @@
 
 	/* this will work only for 'file://' URIs */
 	locale_filename = g_filename_from_uri(uri, NULL, NULL);
-#ifdef HAVE_GIO
 	/* g_filename_from_uri() failed, so we probably have a non-local URI */
 	if (locale_filename == NULL)
 	{
@@ -1849,13 +1846,8 @@
 		{
 			geany_debug("The URI '%s' could not be resolved to a local path. This means "
 				"that the URI is invalid or that you don't have gvfs-fuse installed.", uri);
-			return NULL;
 		}
 	}
-#endif
-	if (locale_filename == NULL)
-		geany_debug("The URI '%s' could not be resolved to a local path. This means that the "
-			"URI is invalid or that Geany can't use GVFS (maybe it is not installed).", uri);
 
 	return locale_filename;
 }


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