[clutter] Put g_type_init() under a version check
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] Put g_type_init() under a version check
- Date: Sat, 15 Dec 2012 18:56:24 +0000 (UTC)
commit 1f3e99f886a7b78fb357921742190c4b218e7ebc
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Dec 15 18:44:26 2012 +0000
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.
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 30d3060..b1b8fbb 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 ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]