diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-16 20:17:35 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-16 20:17:35 +0200 |
| commit | 3f386383dc0459fb857c0831aeecb9072f7085d7 (patch) | |
| tree | 892b17cd2a40f4b86bb2a7e9b07cee83f1a895ce /src/xsettings.c | |
| parent | 6434e34375dde73a575c5f88970b2793a7cb7fe6 (diff) | |
| download | emacs-3f386383dc0459fb857c0831aeecb9072f7085d7.tar.gz emacs-3f386383dc0459fb857c0831aeecb9072f7085d7.tar.bz2 emacs-3f386383dc0459fb857c0831aeecb9072f7085d7.zip | |
* xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0
before calling g_type_init.
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index b9813e2b369..a64e09c92e7 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -804,8 +804,10 @@ init_gsettings (void) 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; @@ -861,8 +863,10 @@ init_gconf (void) 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); |