Completely drop HAVE_GIO checks
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5861 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
parent
d61dea84ed
commit
5914176970
@ -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>
|
||||
|
@ -138,8 +138,6 @@ gtk_modules="gtk+-2.0 >= 2.12 glib-2.0 >= 2.16 gio-2.0 >= 2.16"
|
||||
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])
|
||||
|
@ -1601,7 +1601,6 @@ static gchar *write_data_to_disk(const gchar *locale_filename,
|
||||
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 @@ static gchar *write_data_to_disk(const gchar *locale_filename,
|
||||
G_FILE_CREATE_NONE, NULL, NULL, &error);
|
||||
g_object_unref(fp);
|
||||
}
|
||||
#endif
|
||||
else
|
||||
{
|
||||
FILE *fp;
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user