From 98ae6e06d25ad9359670e5a9260e1bba9e913fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Tue, 27 May 2014 16:47:15 +0200
Subject: 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
---
 examples/C/glib/add-connection-dbus-glib.c         | 2 ++
 examples/C/glib/add-connection-libnm-glib.c        | 2 ++
 examples/C/glib/get-active-connections-dbus-glib.c | 2 ++
 examples/C/glib/get-ap-info-libnm-glib.c           | 2 ++
 examples/C/glib/list-connections-dbus-glib.c       | 2 ++
 examples/C/glib/list-connections-libnm-glib.c      | 2 ++
 examples/C/glib/monitor-nm-running-GDBus.c         | 2 ++
 examples/C/glib/monitor-nm-running-dbus-glib.c     | 2 ++
 examples/C/glib/monitor-nm-state-GDBus.c           | 2 ++
 9 files changed, 18 insertions(+)

(limited to 'examples')

diff --git a/examples/C/glib/add-connection-dbus-glib.c b/examples/C/glib/add-connection-dbus-glib.c
index c7c1a3f111..354dcb75a4 100644
--- a/examples/C/glib/add-connection-dbus-glib.c
+++ b/examples/C/glib/add-connection-dbus-glib.c
@@ -102,8 +102,10 @@ int main (int argc, char *argv[])
 	DBusGConnection *bus;
 	DBusGProxy *proxy;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
 	/* Initialize GType system */
 	g_type_init ();
+#endif
 
 	/* Get system bus */
 	bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
diff --git a/examples/C/glib/add-connection-libnm-glib.c b/examples/C/glib/add-connection-libnm-glib.c
index 510e06ee7a..28eadf8d3a 100644
--- a/examples/C/glib/add-connection-libnm-glib.c
+++ b/examples/C/glib/add-connection-libnm-glib.c
@@ -110,8 +110,10 @@ int main (int argc, char *argv[])
 	NMRemoteSettings *settings;
 	GMainLoop *loop;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
 	/* Initialize GType system */
 	g_type_init ();
+#endif
 
 	loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/examples/C/glib/get-active-connections-dbus-glib.c b/examples/C/glib/get-active-connections-dbus-glib.c
index d6bd15c708..86adbde3e8 100644
--- a/examples/C/glib/get-active-connections-dbus-glib.c
+++ b/examples/C/glib/get-active-connections-dbus-glib.c
@@ -223,8 +223,10 @@ int main (int argc, char *argv[])
 	DBusGConnection *bus;
 	DBusGProxy *props_proxy;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
 	/* Initialize GType system */
 	g_type_init ();
+#endif
 
 	/* Get system bus */
 	bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
diff --git a/examples/C/glib/get-ap-info-libnm-glib.c b/examples/C/glib/get-ap-info-libnm-glib.c
index c144be23eb..f38ca9109f 100644
--- a/examples/C/glib/get-ap-info-libnm-glib.c
+++ b/examples/C/glib/get-ap-info-libnm-glib.c
@@ -200,8 +200,10 @@ int main (int argc, char *argv[])
 	const GPtrArray *devices;
 	int i;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
 	/* Initialize GType system */
 	g_type_init ();
+#endif
 
 	/* Get system bus */
 	bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
diff --git a/examples/C/glib/list-connections-dbus-glib.c b/examples/C/glib/list-connections-dbus-glib.c
index 3fd3fe765d..e17b8dc7d5 100644
--- a/examples/C/glib/list-connections-dbus-glib.c
+++ b/examples/C/glib/list-connections-dbus-glib.c
@@ -67,8 +67,10 @@ int main (int argc, char *argv[])
 	DBusGConnection *bus;
 	DBusGProxy *proxy;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
 	/* Initialize GType system */
 	g_type_init ();
+#endif
 
 	/* Get system bus */
 	bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
diff --git a/examples/C/glib/list-connections-libnm-glib.c b/examples/C/glib/list-connections-libnm-glib.c
index 921dd683c2..29f105c60f 100644
--- a/examples/C/glib/list-connections-libnm-glib.c
+++ b/examples/C/glib/list-connections-libnm-glib.c
@@ -153,8 +153,10 @@ int main (int argc, char *argv[])
 {
 	DBusGConnection *bus;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
 	/* Initialize GType system */
 	g_type_init ();
+#endif
 
 	/* Get system bus */
 	bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
diff --git a/examples/C/glib/monitor-nm-running-GDBus.c b/examples/C/glib/monitor-nm-running-GDBus.c
index 5cc7232449..9e38d4c70d 100644
--- a/examples/C/glib/monitor-nm-running-GDBus.c
+++ b/examples/C/glib/monitor-nm-running-GDBus.c
@@ -57,8 +57,10 @@ main (int argc, char *argv[])
 	GMainLoop *loop;
 	GBusNameWatcherFlags flags;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
 	/* Initialize GType system */
 	g_type_init ();
+#endif
 
 	g_print ("Monitor 'org.freedesktop.NetworkManager' D-Bus name\n");
 	g_print ("===================================================\n");
diff --git a/examples/C/glib/monitor-nm-running-dbus-glib.c b/examples/C/glib/monitor-nm-running-dbus-glib.c
index 3290fb1acd..0b01a57f06 100644
--- a/examples/C/glib/monitor-nm-running-dbus-glib.c
+++ b/examples/C/glib/monitor-nm-running-dbus-glib.c
@@ -71,8 +71,10 @@ main (int argc, char *argv[])
 	GError *err = NULL;
 	gboolean nm_running;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
 	/* Initialize GType system */
 	g_type_init ();
+#endif
 
 	g_print ("Monitor 'org.freedesktop.NetworkManager' D-Bus name\n");
 	g_print ("===================================================\n");
diff --git a/examples/C/glib/monitor-nm-state-GDBus.c b/examples/C/glib/monitor-nm-state-GDBus.c
index a3c5d8e131..f401972536 100644
--- a/examples/C/glib/monitor-nm-state-GDBus.c
+++ b/examples/C/glib/monitor-nm-state-GDBus.c
@@ -91,8 +91,10 @@ main (int argc, char *argv[])
 	GDBusProxyFlags flags;
 	GDBusProxy *proxy;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
 	/* Initialize GType system */
 	g_type_init ();
+#endif
 
 	/* Monitor 'StateChanged' signal on 'org.freedesktop.NetworkManager' interface */
 	g_print ("Monitor NetworkManager's state\n");
-- 
cgit v1.2.1