[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114313: * configure.ac: Do not check for g_type_ini
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r114313: * configure.ac: Do not check for g_type_init because we |
Date: |
Tue, 17 Sep 2013 06:34:43 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114313
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 10:33:24 +0400
message:
* configure.ac: Do not check for g_type_init because we
require glib >= 2.28 for GTK3, glib >= 2.10 for GTK2,
glib >= 2.26 for GSettings and glib >= 2.7.0 for GConf, so
suitable glib should provide g_type_init unconditionally.
* src/image.c (fn_g_type_init) [WINDOWSNT]: Define and load
only if Glib < 2.36.0.
(fn_g_type_init) [!WINDOWSNT]: Define only if Glib < 2.36.0.
* src/xsettings.c (init_gconf, init_gsettings): Do not check
for g_type_init.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/image.c image.c-20091113204419-o5vbwnq5f7feedwu-2969
src/xsettings.c xsettings.c-20091117210551-bqxn4u9uesl3d17a-4
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-09-15 17:58:46 +0000
+++ b/ChangeLog 2013-09-17 06:33:24 +0000
@@ -1,3 +1,10 @@
+2013-09-17 Dmitry Antipov <address@hidden>
+
+ * configure.ac: Do not check for g_type_init because we
+ require glib >= 2.28 for GTK3, glib >= 2.10 for GTK2,
+ glib >= 2.26 for GSettings and glib >= 2.7.0 for GConf, so
+ suitable glib should provide g_type_init unconditionally.
+
2013-09-15 Jan Djärv <address@hidden>
* configure.ac: Add check for OSX 10.5, required for macfont.o.
=== modified file 'configure.ac'
--- a/configure.ac 2013-09-15 17:58:46 +0000
+++ b/configure.ac 2013-09-17 06:33:24 +0000
@@ -2389,7 +2389,6 @@
SAVE_LIBS="$LIBS"
CFLAGS="$SETTINGS_CFLAGS $CFLAGS"
LIBS="$SETTINGS_LIBS $LIBS"
- AC_CHECK_FUNCS([g_type_init])
CFLAGS="$SAVE_CFLAGS"
LIBS="$SAVE_LIBS"
fi
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-09-16 18:17:35 +0000
+++ b/src/ChangeLog 2013-09-17 06:33:24 +0000
@@ -1,3 +1,11 @@
+2013-09-17 Dmitry Antipov <address@hidden>
+
+ * image.c (fn_g_type_init) [WINDOWSNT]: Define and load
+ only if Glib < 2.36.0.
+ (fn_g_type_init) [!WINDOWSNT]: Define only if Glib < 2.36.0.
+ * xsettings.c (init_gconf, init_gsettings): Do not check
+ for g_type_init.
+
2013-09-16 Jan Djärv <address@hidden>
* xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0
=== modified file 'src/image.c'
--- a/src/image.c 2013-09-13 15:03:51 +0000
+++ b/src/image.c 2013-09-17 06:33:24 +0000
@@ -8590,7 +8590,9 @@
DEF_IMGLIB_FN (gboolean, gdk_pixbuf_get_has_alpha, (const GdkPixbuf *));
DEF_IMGLIB_FN (int, gdk_pixbuf_get_bits_per_sample, (const GdkPixbuf *));
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
DEF_IMGLIB_FN (void, g_type_init, (void));
+#endif
DEF_IMGLIB_FN (void, g_object_unref, (gpointer));
DEF_IMGLIB_FN (void, g_error_free, (GError *));
@@ -8622,7 +8624,9 @@
LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_has_alpha);
LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_bits_per_sample);
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
LOAD_IMGLIB_FN (gobject, g_type_init);
+#endif
LOAD_IMGLIB_FN (gobject, g_object_unref);
LOAD_IMGLIB_FN (glib, g_error_free);
@@ -8647,7 +8651,9 @@
#define fn_gdk_pixbuf_get_has_alpha gdk_pixbuf_get_has_alpha
#define fn_gdk_pixbuf_get_bits_per_sample gdk_pixbuf_get_bits_per_sample
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
#define fn_g_type_init g_type_init
+#endif
#define fn_g_object_unref g_object_unref
#define fn_g_error_free g_error_free
#endif /* !WINDOWSNT */
@@ -8732,9 +8738,12 @@
int x;
int y;
- /* g_type_init is a glib function that must be called prior to using
- gnome type library functions. */
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
+ /* g_type_init is a glib function that must be called prior to
+ using gnome type library functions (obsolete since 2.36.0). */
fn_g_type_init ();
+#endif
+
/* Make a handle to a new rsvg object. */
rsvg_handle = fn_rsvg_handle_new ();
=== modified file 'src/xsettings.c'
--- a/src/xsettings.c 2013-09-16 18:17:35 +0000
+++ b/src/xsettings.c 2013-09-17 06:33:24 +0000
@@ -803,11 +803,9 @@
const gchar *const *schemas;
int schema_found = 0;
-#ifdef HAVE_G_TYPE_INIT
#if ! GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
-#endif
schemas = g_settings_list_schemas ();
if (schemas == NULL) return;
@@ -862,11 +860,9 @@
#if defined (HAVE_GCONF)
char *s;
-#ifdef HAVE_G_TYPE_INIT
#if ! GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
-#endif
gconf_client = gconf_client_get_default ();
gconf_client_set_error_handling (gconf_client, GCONF_CLIENT_HANDLE_NONE);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114313: * configure.ac: Do not check for g_type_init because we,
Dmitry Antipov <=