diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2012-12-15 18:44:26 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2012-12-15 18:44:26 +0000 |
| commit | 1f3e99f886a7b78fb357921742190c4b218e7ebc (patch) | |
| tree | 702030da3ef2dc7be3221f9768eff98b159fad8d /clutter/clutter-main.c | |
| parent | 57956461dcc0705d88b8acb7d8ce0b9bc7931445 (diff) | |
| download | clutter-1f3e99f886a7b78fb357921742190c4b218e7ebc.tar.gz | |
Put g_type_init() under a version check
GLib 2.36 will deprecate g_type_init() in favour of automatic
initialization through a constructor function. We need to add the
version check to avoid a compiler warning.
Diffstat (limited to 'clutter/clutter-main.c')
| -rw-r--r-- | clutter/clutter-main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 30d306044..b1b8fbbc5 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -2835,8 +2835,10 @@ clutter_base_init (void) bindtextdomain (GETTEXT_PACKAGE, CLUTTER_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +#if !GLIB_CHECK_VERSION (2, 35, 1) /* initialise GLib type system */ g_type_init (); +#endif /* initialise the Big Clutter Lock™ if necessary */ clutter_threads_init_default (); |