[Spice-devel] [PATCH 1/3] g_type_init() is deprecated in GLib 2.36

[Fabiano Fidêncio]

---
 gtk/controller/dump.c                  | 2 ++
 gtk/spice-client-glib-usb-acl-helper.c | 2 ++
 gtk/spicy-screenshot.c                 | 2 ++
 gtk/spicy-stats.c                      | 2 ++
 gtk/spicy.c                            | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/gtk/controller/dump.c b/gtk/controller/dump.c
index 4fcfe58..306ff3a 100644
--- a/gtk/controller/dump.c
+++ b/gtk/controller/dump.c
@@ -90,7 +90,9 @@ void connect_signals (gpointer obj)
 
 int main (int argc, char *argv[])
 {
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init ();
+#endif
     loop = g_main_loop_new (NULL, FALSE);
 
     if (argc > 1 && g_str_equal(argv[1], "--menu")) {
diff --git a/gtk/spice-client-glib-usb-acl-helper.c b/gtk/spice-client-glib-usb-acl-helper.c
index 3ed6cad..fe247ac 100644
--- a/gtk/spice-client-glib-usb-acl-helper.c
+++ b/gtk/spice-client-glib-usb-acl-helper.c
@@ -338,7 +338,9 @@ int main(void)
         return 1;
     }
 
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
 
     loop = g_main_loop_new(NULL, FALSE);
 
diff --git a/gtk/spicy-screenshot.c b/gtk/spicy-screenshot.c
index 43664b6..b60fb42 100644
--- a/gtk/spicy-screenshot.c
+++ b/gtk/spicy-screenshot.c
@@ -178,7 +178,9 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
     mainloop = g_main_loop_new(NULL, false);
 
     session = spice_session_new();
diff --git a/gtk/spicy-stats.c b/gtk/spicy-stats.c
index f176ead..e236223 100644
--- a/gtk/spicy-stats.c
+++ b/gtk/spicy-stats.c
@@ -110,7 +110,9 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
     mainloop = g_main_loop_new(NULL, false);
 
     session = spice_session_new();
diff --git a/gtk/spicy.c b/gtk/spicy.c
index 038d622..57af34c 100644
--- a/gtk/spicy.c
+++ b/gtk/spicy.c
@@ -1845,7 +1845,9 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
     mainloop = g_main_loop_new(NULL, false);
 
     conn = connection_new();
-- 
1.9.3