diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2014-05-27 16:47:15 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2014-05-27 16:58:21 +0200 |
| commit | 98ae6e06d25ad9359670e5a9260e1bba9e913fcb (patch) | |
| tree | 18dde4f3f7861b280f926c937abb2ec162e784b0 /libnm-glib | |
| parent | aba55670cc8af780df0af89002272b612f49a54e (diff) | |
| download | NetworkManager-98ae6e06d25ad9359670e5a9260e1bba9e913fcb.tar.gz | |
all: g_type_init() has been deprecated in GLib 2.35.0
g_type_init() deprecation:
https://bugzilla.gnome.org/show_bug.cgi?id=686161
Diffstat (limited to 'libnm-glib')
| -rw-r--r-- | libnm-glib/libnm-glib-test.c | 2 | ||||
| -rw-r--r-- | libnm-glib/libnm_glib.c | 3 | ||||
| -rw-r--r-- | libnm-glib/tests/test-nm-client.c | 2 | ||||
| -rw-r--r-- | libnm-glib/tests/test-remote-settings-client.c | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index 48a8ff1692..36520f50c3 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -390,7 +390,9 @@ main (int argc, char *argv[]) { NMClient *client; +#if !GLIB_CHECK_VERSION (2, 35, 0) g_type_init (); +#endif client = nm_client_new (); if (!client) { diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c index 2abd6ab881..a2a6d26ed0 100644 --- a/libnm-glib/libnm_glib.c +++ b/libnm-glib/libnm_glib.c @@ -493,7 +493,10 @@ libnm_glib_init (void) { libnm_glib_ctx *ctx = NULL; +#if !GLIB_CHECK_VERSION (2, 35, 0) g_type_init (); +#endif + if (!g_thread_supported ()) g_thread_init (NULL); dbus_g_thread_init (); diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index 5bbb1cd41c..b181c8fa3a 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -931,7 +931,9 @@ main (int argc, char **argv) { g_assert (argc == 3); +#if !GLIB_CHECK_VERSION (2, 35, 0) g_type_init (); +#endif g_test_init (&argc, &argv, NULL); diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index 1299ce8f85..e3ef7f22ef 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -352,7 +352,9 @@ main (int argc, char **argv) g_assert (argc == 3); +#if !GLIB_CHECK_VERSION (2, 35, 0) g_type_init (); +#endif g_test_init (&argc, &argv, NULL); |