Stop deprecation warnings from glib >= 2.36

10 files changed, 21 insertions, 1 deletions

diff --git a/tests/src/X.c b/tests/src/X.c
index 3fe309b0..a6aeac44 100644
--- a/tests/src/X.c
+++ b/tests/src/X.c
@@ -255,8 +255,10 @@ main (int argc, char **argv)
     signal (SIGINT, signal_cb);
     signal (SIGTERM, signal_cb);
     signal (SIGHUP, signal_cb);
-  
+
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/tests/src/Xvnc.c b/tests/src/Xvnc.c
index 451c33e1..6b828c23 100644
--- a/tests/src/Xvnc.c
+++ b/tests/src/Xvnc.c
@@ -177,7 +177,9 @@ main (int argc, char **argv)
     signal (SIGTERM, signal_cb);
     signal (SIGHUP, signal_cb);
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/tests/src/guest-account.c b/tests/src/guest-account.c
index b3459548..f45a59e8 100644
--- a/tests/src/guest-account.c
+++ b/tests/src/guest-account.c
@@ -19,7 +19,9 @@ main (int argc, char **argv)
 {
     gchar *passwd_path;
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     status_connect (request_cb);
 
diff --git a/tests/src/plymouth.c b/tests/src/plymouth.c
index aa8da5e6..3537014e 100644
--- a/tests/src/plymouth.c
+++ b/tests/src/plymouth.c
@@ -15,7 +15,9 @@ request_cb (const gchar *message)
 int
 main (int argc, char **argv)
 {
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     status_connect (request_cb);
 
diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index da31796b..6c6aeb40 100644
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -192,7 +192,9 @@ main (int argc, char **argv)
     signal (SIGINT, signal_cb);
     signal (SIGTERM, signal_cb);
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     main_loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp
index 85007692..92f48a26 100644
--- a/tests/src/test-qt-greeter.cpp
+++ b/tests/src/test-qt-greeter.cpp
@@ -115,7 +115,9 @@ request_cb (const gchar *request)
 int
 main(int argc, char *argv[])
 {
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     status_connect (request_cb);
 
diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c
index 80560158..961d2352 100644
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -1181,7 +1181,9 @@ main (int argc, char **argv)
     gchar cwd[1024];
     GError *error = NULL;
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/tests/src/test-script-hook.c b/tests/src/test-script-hook.c
index 028d1ff6..e3212005 100644
--- a/tests/src/test-script-hook.c
+++ b/tests/src/test-script-hook.c
@@ -14,7 +14,9 @@ request_cb (const gchar *message)
 int
 main (int argc, char **argv)
 {
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     status_connect (request_cb);
 
diff --git a/tests/src/test-session.c b/tests/src/test-session.c
index 6a3dd79e..c0d20ba4 100644
--- a/tests/src/test-session.c
+++ b/tests/src/test-session.c
@@ -164,7 +164,9 @@ main (int argc, char **argv)
     signal (SIGINT, quit_cb);
     signal (SIGTERM, quit_cb);
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/tests/src/vnc-client.c b/tests/src/vnc-client.c
index 8e4e7968..8577b39d 100644
--- a/tests/src/vnc-client.c
+++ b/tests/src/vnc-client.c
@@ -28,7 +28,9 @@ main (int argc, char **argv)
     gchar buffer[1024];
     gssize n_read, n_sent;
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     status_connect (request_cb);