Revision: 5861 http://geany.svn.sourceforge.net/geany/?rev=5861&view=rev Author: colombanw Date: 2011-06-20 16:11:46 +0000 (Mon, 20 Jun 2011)

Log Message: ----------- Completely drop HAVE_GIO checks

Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/src/document.c trunk/win32-config.h

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-06-20 16:11:18 UTC (rev 5860) +++ trunk/ChangeLog 2011-06-20 16:11:46 UTC (rev 5861) @@ -4,6 +4,8 @@ doc/geany.html: Add an hidden pref to choose between GIO and plain C unsafe file saving. + * configure.ac, src/document.c, win32-config.h: + Completely drop HAVE_GIO checks.

2011-06-18 Colomban Wendling <colomban(at)geany(dot)org>

Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2011-06-20 16:11:18 UTC (rev 5860) +++ trunk/configure.ac 2011-06-20 16:11:46 UTC (rev 5861) @@ -138,8 +138,6 @@ PKG_CHECK_MODULES(GTK, [$gtk_modules]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -# currently define it, but we will be able to drop the checks now we hard-depend on it -AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available]) # GTHREAD checks gthread_modules="gthread-2.0" PKG_CHECK_MODULES(GTHREAD, [$gthread_modules])

Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-06-20 16:11:18 UTC (rev 5860) +++ trunk/src/document.c 2011-06-20 16:11:46 UTC (rev 5861) @@ -1601,7 +1601,6 @@ if (g_file_set_contents(locale_filename, data, len, &error)) geany_debug("Wrote %s with g_file_set_contents().", locale_filename); } -#ifdef HAVE_GIO else if (file_prefs.use_gio_unsafe_file_saving) { GFile *fp; @@ -1614,7 +1613,6 @@ G_FILE_CREATE_NONE, NULL, NULL, &error); g_object_unref(fp); } -#endif else { FILE *fp;

Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2011-06-20 16:11:18 UTC (rev 5860) +++ trunk/win32-config.h 2011-06-20 16:11:46 UTC (rev 5861) @@ -321,9 +321,6 @@ /* Define if you want to detect a running instance */ #define HAVE_SOCKET 1

-/* Define if GIO should be used */ -#define HAVE_GIO 1 - /* Define if include regex library should be used */ #define USE_INCLUDED_REGEX 1

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