Merge branch 'master' into next

[Also remove g_type_init() from the Logger, matching
telepathy-glib. -smcv]

Conflicts:
	examples/client/js/contact-list.js
	examples/client/js/debug-client.js
	examples/client/python/contact-list.py
	examples/client/python/dialler.py
	examples/client/python/ensure-channel.py
	examples/client/python/file-transfer.py
	examples/client/python/ft-handler.py
	examples/client/python/inspect-cm.py
	examples/client/python/stream-tube-accepter.py
	examples/client/python/stream-tube-offerer.py
	examples/client/python/text-handler.py
	examples/client/stream-tubes/offerer.c
	telepathy-glib/file-transfer-channel.c
	tests/dbus/connection-balance.c
	tests/dbus/connection-bug-18845.c
	tests/dbus/connection-getinterfaces-failure.c
	tests/dbus/connection-handles.c
	tests/dbus/connection-inject-bug16307.c
	tests/dbus/params-cm.c
	tests/dbus/text-mixin.c
	tests/enums.c

16 files changed, 0 insertions, 23 deletions

diff --git a/examples/client/approver.c b/examples/client/approver.c
index 7da0eff5d..8e132326e 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"));
 
   approver = tp_simple_approver_new (NULL, "ExampleApprover",
diff --git a/examples/client/contact-list.c b/examples/client/contact-list.c
index 49d3b1b43..23f94733c 100644
--- a/examples/client/contact-list.c
+++ b/examples/client/contact-list.c
@@ -74,7 +74,6 @@ main (int argc,
   TpClientFactory *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 fe8362c88..2faf87d8c 100644
--- a/examples/client/dbus-tubes/accepter.c
+++ b/examples/client/dbus-tubes/accepter.c
@@ -186,8 +186,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 396d409f1..4991cb863 100644
--- a/examples/client/dbus-tubes/offerer.c
+++ b/examples/client/dbus-tubes/offerer.c
@@ -189,8 +189,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 846b7ae56..8e1ae39a5 100644
--- a/examples/client/extended-client.c
+++ b/examples/client/extended-client.c
@@ -285,7 +285,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 5a39c548c..79c148598 100644
--- a/examples/client/inspect-channel.c
+++ b/examples/client/inspect-channel.c
@@ -137,7 +137,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 367dbbed0..82e489e6f 100644
--- a/examples/client/inspect-connection.c
+++ b/examples/client/inspect-connection.c
@@ -88,7 +88,6 @@ main (int argc,
   TpClientFactory *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 0df105528..734f73783 100644
--- a/examples/client/inspect-contact.c
+++ b/examples/client/inspect-contact.c
@@ -158,7 +158,6 @@ main (int argc,
   TpClientFactory *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 464965887..194e1f5bb 100644
--- a/examples/client/media-observer.c
+++ b/examples/client/media-observer.c
@@ -78,7 +78,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 3f298ef8d..98b09684e 100644
--- a/examples/client/stream-tubes/accepter.c
+++ b/examples/client/stream-tubes/accepter.c
@@ -136,8 +136,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 2e9134a64..35f1f31ca 100644
--- a/examples/client/stream-tubes/offerer.c
+++ b/examples/client/stream-tubes/offerer.c
@@ -147,8 +147,6 @@ main (int argc,
       return 2;
     }
 
-  g_type_init ();
-
   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 7c558d4a8..6c6b884db 100644
--- a/examples/client/text-handler.c
+++ b/examples/client/text-handler.c
@@ -118,7 +118,6 @@ main (int argc,
   GError *error = NULL;
   TpBaseClient *handler;
 
-  g_type_init ();
   tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
 
   handler = tp_simple_handler_new (NULL, FALSE, FALSE,
diff --git a/examples/cm/call/main.c b/examples/cm/call/main.c
index b96a5c606..aec543884 100644
--- a/examples/cm/call/main.c
+++ b/examples/cm/call/main.c
@@ -48,10 +48,6 @@ main (int argc,
   if (g_getenv ("EXAMPLE_PERSIST") != NULL)
     tp_debug_set_persistent (TRUE);
 
-  /* strictly speaking, this is only necessary for client code, but it's
-   * harmless here */
-  g_type_init ();
-
   return tp_run_connection_manager ("telepathy-example-cm-call",
       VERSION, construct_cm, argc, argv);
 }