procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.ac: Do not check for g_type_init because we

Browse source 
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.
This commit is contained in:
Dmitry Antipov 2013-09-17 10:33:24 +04:00
parent 1149ffdb07
commit 19452b8665
5 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-09-17 Dmitry Antipov <dmantipov@yandex.ru>
* 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 <jan.h.d@swipnet.se>
* configure.ac: Add check for OSX 10.5, required for macfont.o.

1
configure.ac
View file

@ -2389,7 +2389,6 @@ if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then
SAVE_LIBS="$LIBS"
CFLAGS="$SETTINGS_CFLAGS $CFLAGS"
LIBS="$SETTINGS_LIBS $LIBS"
AC_CHECK_FUNCS([g_type_init])
CFLAGS="$SAVE_CFLAGS"
LIBS="$SAVE_LIBS"
fi

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2013-09-17 Dmitry Antipov <dmantipov@yandex.ru>
* 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 <jan.h.d@swipnet.se>
* xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0

13
src/image.c
View file

@ -8590,7 +8590,9 @@ DEF_IMGLIB_FN (int, gdk_pixbuf_get_n_channels, (const GdkPixbuf *));
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 @@ init_svg_functions (void)
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 @@ init_svg_functions (void)
#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 @@ svg_load_image (struct frame *f, /* Pointer to emacs frame structure. *
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 ();

4
src/xsettings.c
View file

@ -803,10 +803,8 @@ init_gsettings (void)
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 ();
@ -862,10 +860,8 @@ init_gconf (void)
#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 ();