diff options
| author | Dmitry Antipov <[email protected]> | 2013-09-17 10:33:24 +0400 |
|---|---|---|
| committer | Dmitry Antipov <[email protected]> | 2013-09-17 10:33:24 +0400 |
| commit | 19452b86657532741d78fa3bcc12b12b58a8a54b (patch) | |
| tree | 5c928382e6df92cb838f8483415b8932bb3e15a4 /src/xsettings.c | |
| parent | 1149ffdb07563832d2593320d79970c8266ae85c (diff) | |
* 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.
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index a64e09c92e..770cd8e4a5 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -803,11 +803,9 @@ 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 (); if (schemas == NULL) return; @@ -862,11 +860,9 @@ 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 (); gconf_client_set_error_handling (gconf_client, GCONF_CLIENT_HANDLE_NONE); |