summaryrefslogtreecommitdiff
path: root/examples/client
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-11-11 17:19:59 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-01-07 13:49:43 +0000
commite3d4c2977fbf086e7d42c77e3713e1bcddda2a9c (patch)
tree6b9bd0fb1a069796367724a31e822797129febd7 /examples/client
parent4480d2b9f5bb72c8acf0e9f712c6f8346a174f91 (diff)
Stop calling g_type_init()
It was deprecated in GLib 2.36, and we already have a hard dependency on that version. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71048 Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'examples/client')
-rw-r--r--examples/client/approver.c1
-rw-r--r--examples/client/contact-list.c1
-rw-r--r--examples/client/dbus-tubes/accepter.c2
-rw-r--r--examples/client/dbus-tubes/offerer.c2
-rw-r--r--examples/client/extended-client.c1
-rw-r--r--examples/client/inspect-channel.c1
-rw-r--r--examples/client/inspect-cm.c1
-rw-r--r--examples/client/inspect-connection.c1
-rw-r--r--examples/client/inspect-contact.c1
-rw-r--r--examples/client/list-connections.c1
-rw-r--r--examples/client/list-managers.c1
-rw-r--r--examples/client/media-observer.c1
-rw-r--r--examples/client/stream-tubes/accepter.c2
-rw-r--r--examples/client/stream-tubes/offerer.c2
-rw-r--r--examples/client/text-handler.c1
15 files changed, 0 insertions, 19 deletions
diff --git a/examples/client/approver.c b/examples/client/approver.c
index 800f19788..3cc6f88c0 100644
--- a/examples/client/approver.c
+++ b/examples/client/approver.c
@@ -143,7 +143,6 @@ main (int argc,
GError *error = NULL;
TpBaseClient *approver;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
manager = tp_account_manager_dup ();
diff --git a/examples/client/contact-list.c b/examples/client/contact-list.c
index 5ed82a4af..7506d473f 100644
--- a/examples/client/contact-list.c
+++ b/examples/client/contact-list.c
@@ -74,7 +74,6 @@ main (int argc,
TpSimpleClientFactory *factory;
GMainLoop *loop;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
loop = g_main_loop_new (NULL, FALSE);
diff --git a/examples/client/dbus-tubes/accepter.c b/examples/client/dbus-tubes/accepter.c
index 2f2dae5ca..1219e6e1a 100644
--- a/examples/client/dbus-tubes/accepter.c
+++ b/examples/client/dbus-tubes/accepter.c
@@ -185,8 +185,6 @@ main (int argc,
TpBaseClient *handler;
GError *error = NULL;
- g_type_init ();
-
manager = tp_account_manager_dup ();
handler = tp_simple_handler_new_with_am (manager, FALSE, FALSE,
"ExampleServiceHandler", FALSE, handle_channels, NULL, NULL);
diff --git a/examples/client/dbus-tubes/offerer.c b/examples/client/dbus-tubes/offerer.c
index 2e4807bfc..48221a08d 100644
--- a/examples/client/dbus-tubes/offerer.c
+++ b/examples/client/dbus-tubes/offerer.c
@@ -188,8 +188,6 @@ main (int argc,
TpAccountChannelRequest *req;
GHashTable *request;
- g_type_init ();
-
if (argc != 3)
{
g_printerr ("Usage: offerer gabble/jabber/ladygaga t-pain@example.com\n");
diff --git a/examples/client/extended-client.c b/examples/client/extended-client.c
index 117223179..a2af57115 100644
--- a/examples/client/extended-client.c
+++ b/examples/client/extended-client.c
@@ -284,7 +284,6 @@ main (int argc,
GError *error = NULL;
TpDBusDaemon *dbus = NULL;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
example_cli_init ();
diff --git a/examples/client/inspect-channel.c b/examples/client/inspect-channel.c
index 969a4f831..ef8c89270 100644
--- a/examples/client/inspect-channel.c
+++ b/examples/client/inspect-channel.c
@@ -136,7 +136,6 @@ main (int argc,
TpConnection *connection = NULL;
GError *error = NULL;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
if (argc < 3)
diff --git a/examples/client/inspect-cm.c b/examples/client/inspect-cm.c
index 68fefedbe..c2a1532be 100644
--- a/examples/client/inspect-cm.c
+++ b/examples/client/inspect-cm.c
@@ -233,7 +233,6 @@ main (int argc,
TpDBusDaemon *dbus = NULL;
int ret = 1;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
if (g_getenv ("EXAMPLE_TIMING") != NULL)
diff --git a/examples/client/inspect-connection.c b/examples/client/inspect-connection.c
index 6b6fa81a1..460887a71 100644
--- a/examples/client/inspect-connection.c
+++ b/examples/client/inspect-connection.c
@@ -86,7 +86,6 @@ main (int argc,
TpSimpleClientFactory *factory;
GError *error = NULL;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
if (argc < 2)
diff --git a/examples/client/inspect-contact.c b/examples/client/inspect-contact.c
index 5c967c528..f960e0850 100644
--- a/examples/client/inspect-contact.c
+++ b/examples/client/inspect-contact.c
@@ -157,7 +157,6 @@ main (int argc,
TpSimpleClientFactory *factory;
GError *error = NULL;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
if (argc < 2)
diff --git a/examples/client/list-connections.c b/examples/client/list-connections.c
index 1b3211f04..3df69ee1e 100644
--- a/examples/client/list-connections.c
+++ b/examples/client/list-connections.c
@@ -62,7 +62,6 @@ main (int argc,
TpDBusDaemon *bus_daemon;
GError *error = NULL;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
bus_daemon = tp_dbus_daemon_dup (&error);
diff --git a/examples/client/list-managers.c b/examples/client/list-managers.c
index bffd19b23..87109e597 100644
--- a/examples/client/list-managers.c
+++ b/examples/client/list-managers.c
@@ -60,7 +60,6 @@ main (int argc,
TpDBusDaemon *bus_daemon;
GError *error = NULL;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
bus_daemon = tp_dbus_daemon_dup (&error);
diff --git a/examples/client/media-observer.c b/examples/client/media-observer.c
index 0d9a6940d..ef0aa8960 100644
--- a/examples/client/media-observer.c
+++ b/examples/client/media-observer.c
@@ -76,7 +76,6 @@ main (int argc,
GError *error = NULL;
TpBaseClient *observer;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
manager = tp_account_manager_dup ();
diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c
index 574173abb..ed820562d 100644
--- a/examples/client/stream-tubes/accepter.c
+++ b/examples/client/stream-tubes/accepter.c
@@ -135,8 +135,6 @@ main (int argc,
TpBaseClient *handler;
GError *error = NULL;
- g_type_init ();
-
manager = tp_account_manager_dup ();
handler = tp_simple_handler_new_with_am (manager, FALSE, FALSE,
"ExampleServiceHandler", FALSE, _handle_channels, NULL, NULL);
diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c
index 8d62da38d..16bb9279a 100644
--- a/examples/client/stream-tubes/offerer.c
+++ b/examples/client/stream-tubes/offerer.c
@@ -146,8 +146,6 @@ main (int argc,
return 2;
}
- g_type_init ();
-
factory = TP_SIMPLE_CLIENT_FACTORY (tp_automatic_client_factory_new (NULL));
account_path = g_strconcat (TP_ACCOUNT_OBJECT_PATH_BASE, argv[1], NULL);
diff --git a/examples/client/text-handler.c b/examples/client/text-handler.c
index 4eb94f565..6a079c878 100644
--- a/examples/client/text-handler.c
+++ b/examples/client/text-handler.c
@@ -124,7 +124,6 @@ main (int argc,
GError *error = NULL;
TpBaseClient *handler;
- g_type_init ();
tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
manager = tp_account_manager_dup ();