Stop deprecation warnings from glib >= 2.36

diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp
index 717f5c2d9a2d1f65fdbdd12eaf5ac56d05f84240..93152568a1e768e2c848adc2db5f6ae4a23dbeee 100644 (file)
--- a/liblightdm-qt/greeter.cpp
+++ b/liblightdm-qt/greeter.cpp
@@ -42,7 +42,9 @@ private:
 GreeterPrivate::GreeterPrivate(Greeter *parent) :
     q_ptr(parent)
 {
+#if !defined(GLIB_VERSION_2_36)
     g_type_init();
+#endif
     ldmGreeter = lightdm_greeter_new();
 
     g_signal_connect (ldmGreeter, "show-prompt", G_CALLBACK (cb_showPrompt), this);

diff --git a/liblightdm-qt/sessionsmodel.cpp b/liblightdm-qt/sessionsmodel.cpp
index 3315c71bd9433feaf17ff0aaa5fa7b0a7c9c9415..63c06154e5d7924cd21fa8fa66548190a9350756 100644 (file)
--- a/liblightdm-qt/sessionsmodel.cpp
+++ b/liblightdm-qt/sessionsmodel.cpp
@@ -46,7 +46,9 @@ private:
 SessionsModelPrivate::SessionsModelPrivate(SessionsModel *parent) :
     q_ptr(parent)
 {
+#if !defined(GLIB_VERSION_2_36)
     g_type_init();
+#endif
 }
 
 void SessionsModelPrivate::loadSessions(SessionsModel::SessionType sessionType)

diff --git a/liblightdm-qt/usersmodel.cpp b/liblightdm-qt/usersmodel.cpp
index f16249388901f838ffbe82e8d21c32b09ceee439..94557240d5362ac73b64fc53622a759dbd87f939 100644 (file)
--- a/liblightdm-qt/usersmodel.cpp
+++ b/liblightdm-qt/usersmodel.cpp
@@ -65,7 +65,9 @@ public:
 UsersModelPrivate::UsersModelPrivate(UsersModel* parent) :
     q_ptr(parent)
 {
+#if !defined(GLIB_VERSION_2_36)
     g_type_init();
+#endif  
 }
 
 UsersModelPrivate::~UsersModelPrivate()

diff --git a/src/lightdm.c b/src/lightdm.c
index 79c9fc47e9574c1ade3a66b46dfa8e42d889ae2f..aa1b6b4eb3191dae6f09f1e68d3a2995567c30d6 100644 (file)
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -870,7 +870,9 @@ main (int argc, char **argv)
     if (argc >= 2 && strcmp (argv[1], "--session-child") == 0)
         return session_child_run (argc, argv);
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
     loop = g_main_loop_new (NULL, FALSE);
 
     g_signal_connect (process_get_current (), "got-signal", G_CALLBACK (signal_cb), NULL);

diff --git a/src/session-child.c b/src/session-child.c
index 628d8fafab207bd0ad9add7a69ccfee8ce935328..c06cbc8b992afa6b029d970561c5558b69f57e6e 100644 (file)
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -184,7 +184,9 @@ session_child_run (int argc, char **argv)
     const gchar *path;
     GError *error = NULL;
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     /* Make input non-blocking */
     fd = open ("/dev/null", O_RDONLY);

diff --git a/tests/src/X.c b/tests/src/X.c
index 3fe309b0dcc5a37b5348f48699f513bd76fca351..a6aeac44866d3628b368cbc4f6f9873ed73044a0 100644 (file)
--- 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 451c33e1d373c84a5501cc14a26dbe6d207b0adb..6b828c2399f6f4b07ee7350cda0776f6eae4d0b8 100644 (file)
--- 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 b34595484300e6c583382ed1b1a12d493a81b557..f45a59e8f443d8cffc208b316783bb734958bd3b 100644 (file)
--- 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 aa8da5e64f16dc19a26f44475cd370d31fa5a508..3537014eaf1ad21a5035a0964a25085356278c8f 100644 (file)
--- 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 da31796beb395e7919b32de0e0677ed62312c48e..6c6aeb405b35b9d1ef5d401b5fd7d5fc6cf962af 100644 (file)
--- 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 850076920750913722e3839fd5d3083297f24136..92f48a267e50f7f22f1596c46b5b41f546b66656 100644 (file)
--- 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 80560158627c7e762de5d8567ae86c6cf78fe99b..961d2352637ce61bdaf8aa0de0d76c8045bc3e69 100644 (file)
--- 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 028d1ff66a576795d82aa01836ea10caab03b056..e321200548ae3fa2ea39cc9f4e44c2d6b3de849b 100644 (file)
--- 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 6a3dd79e47cb6957364d42099c97a03727cde3c6..c0d20ba46968bf49c24dfbec629e8cd0fc1491f6 100644 (file)
--- 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 8e4e796859ea72c81fa1096da85e0546feec3177..8577b39de079026b697cc17b5640e0fa5c5d6f6e 100644 (file)
--- 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);
 

diff --git a/utils/dm-tool.c b/utils/dm-tool.c
index d955efd1ca1fa98befd3f14573779e0160bafb10..3382da76bb56427dd69841f7e3452990b89cf9eb 100644 (file)
--- a/utils/dm-tool.c
+++ b/utils/dm-tool.c
@@ -78,7 +78,9 @@ main (int argc, char **argv)
     gint arg_index;
     GBusType bus_type = G_BUS_TYPE_SYSTEM;
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     for (arg_index = 1; arg_index < argc; arg_index++)
     {

diff --git a/utils/lightdm-set-defaults.c b/utils/lightdm-set-defaults.c
index a28efc2a3c742e680a51c74462d882aa5d93b13e..b6114aa0bc9665f371c88369cffe16d53635013b 100644 (file)
--- a/utils/lightdm-set-defaults.c
+++ b/utils/lightdm-set-defaults.c
@@ -169,7 +169,9 @@ main (int argc, char *argv[])
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
     textdomain (GETTEXT_PACKAGE);
 
+#if !defined(GLIB_VERSION_2_36)
     g_type_init ();
+#endif
 
     context = g_option_context_new (N_("- set lightdm default values"));
     g_option_context_add_main_entries (context, entries, NULL);