Stop passing a TpDBusDaemon to TpProxy and subclasses

23 files changed, 4 insertions, 34 deletions

diff --git a/telepathy-farstream/call-content.c b/telepathy-farstream/call-content.c
index 053559eb4..4d0d73d53 100644
--- a/telepathy-farstream/call-content.c
+++ b/telepathy-farstream/call-content.c
@@ -846,7 +846,6 @@ process_media_description (TfCallContent *self,
     }
 
   proxy = g_object_new (TP_TYPE_PROXY,
-      "dbus-daemon", tp_proxy_get_dbus_daemon (self->proxy),
       "bus-name", tp_proxy_get_bus_name (self->proxy),
       "object-path", media_description_objpath,
       "factory", tp_proxy_get_factory (self->proxy),
diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c
index d7a08d237..65d2d2ccb 100644
--- a/telepathy-farstream/call-stream.c
+++ b/telepathy-farstream/call-stream.c
@@ -912,7 +912,6 @@ tf_call_stream_add_endpoint (TfCallStream *self, const gchar *obj_path)
   self->endpoint_objpath = g_strdup (obj_path);
 
   self->endpoint = g_object_new (TP_TYPE_PROXY,
-      "dbus-daemon", tp_proxy_get_dbus_daemon (self->proxy),
       "bus-name", tp_proxy_get_bus_name (self->proxy),
       "object-path", self->endpoint_objpath,
       "factory", tp_proxy_get_factory (self->proxy),
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index b3c497bec..b84a42a83 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -666,7 +666,6 @@ _tp_account_manager_new (TpClientFactory *factory)
   g_return_val_if_fail (TP_IS_CLIENT_FACTORY (factory), NULL);
 
   return TP_ACCOUNT_MANAGER (g_object_new (TP_TYPE_ACCOUNT_MANAGER,
-          "dbus-daemon", tp_client_factory_get_dbus_daemon (factory),
           "bus-name", TP_ACCOUNT_MANAGER_BUS_NAME,
           "object-path", TP_ACCOUNT_MANAGER_OBJECT_PATH,
           "factory", factory,
diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c
index e97315505..fa93b172c 100644
--- a/telepathy-glib/call-channel.c
+++ b/telepathy-glib/call-channel.c
@@ -128,8 +128,6 @@ _tp_call_content_new (TpCallChannel *self,
 {
   return g_object_new (TP_TYPE_CALL_CONTENT,
       "bus-name", tp_proxy_get_bus_name (self),
-      "dbus-daemon", tp_proxy_get_dbus_daemon (self),
-      "dbus-connection", tp_proxy_get_dbus_connection (self),
       "object-path", object_path,
       "connection", tp_channel_get_connection ((TpChannel *) self),
       "channel", self,
diff --git a/telepathy-glib/call-content-media-description.c b/telepathy-glib/call-content-media-description.c
index 8cbd324e3..f024c597a 100644
--- a/telepathy-glib/call-content-media-description.c
+++ b/telepathy-glib/call-content-media-description.c
@@ -677,7 +677,6 @@ tp_call_content_media_description_new (TpDBusDaemon *dbus_daemon,
   g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
 
   return g_object_new (TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION,
-      "dbus-daemon", dbus_daemon,
       "object-path", object_path,
       "further-negotiation-required", further_negotiation_required,
       "has-remote-information", has_remote_information,
diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c
index 4a71635a9..e1f073425 100644
--- a/telepathy-glib/call-content.c
+++ b/telepathy-glib/call-content.c
@@ -112,8 +112,6 @@ _tp_call_stream_new (TpCallContent *self,
 {
   return g_object_new (TP_TYPE_CALL_STREAM,
       "bus-name", tp_proxy_get_bus_name (self),
-      "dbus-daemon", tp_proxy_get_dbus_daemon (self),
-      "dbus-connection", tp_proxy_get_dbus_connection (self),
       "object-path", object_path,
       "connection", self->priv->connection,
       "content", self,
diff --git a/telepathy-glib/channel-dispatcher.c b/telepathy-glib/channel-dispatcher.c
index 772f96fff..843651a9f 100644
--- a/telepathy-glib/channel-dispatcher.c
+++ b/telepathy-glib/channel-dispatcher.c
@@ -116,7 +116,6 @@ TpChannelDispatcher *
 _tp_channel_dispatcher_new (TpClientFactory *factory)
 {
   return TP_CHANNEL_DISPATCHER (g_object_new (TP_TYPE_CHANNEL_DISPATCHER,
-        "dbus-daemon", tp_client_factory_get_dbus_daemon (factory),
         "bus-name", TP_CHANNEL_DISPATCHER_BUS_NAME,
         "object-path", TP_CHANNEL_DISPATCHER_OBJECT_PATH,
         "factory", factory,
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 683eab4c7..ab8efeb4f 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -1127,7 +1127,6 @@ _tp_connection_manager_new (TpClientFactory *factory,
   bus_name = g_strdup_printf ("%s%s", TP_CM_BUS_NAME_BASE, name);
 
   cm = TP_CONNECTION_MANAGER (g_object_new (TP_TYPE_CONNECTION_MANAGER,
-        "dbus-daemon", tp_client_factory_get_dbus_daemon (factory),
         "bus-name", bus_name,
         "object-path", object_path,
         "manager-file", manager_filename,
diff --git a/telepathy-glib/debug-client.c b/telepathy-glib/debug-client.c
index 666f22fdb..4edb4e5ff 100644
--- a/telepathy-glib/debug-client.c
+++ b/telepathy-glib/debug-client.c
@@ -326,7 +326,6 @@ _tp_debug_client_new (TpClientFactory *factory,
     return NULL;
 
   return TP_DEBUG_CLIENT (g_object_new (TP_TYPE_DEBUG_CLIENT,
-      "dbus-daemon", tp_client_factory_get_dbus_daemon (factory),
       "bus-name", unique_name,
       "object-path", TP_DEBUG_OBJECT_PATH,
       "factory", factory,
diff --git a/telepathy-glib/logger.c b/telepathy-glib/logger.c
index b80eaaace..c3d159318 100644
--- a/telepathy-glib/logger.c
+++ b/telepathy-glib/logger.c
@@ -84,7 +84,6 @@ TpLogger *
 _tp_logger_new (TpClientFactory *factory)
 {
   return g_object_new (TP_TYPE_LOGGER,
-      "dbus-daemon", tp_client_factory_get_dbus_daemon (factory),
       "bus-name", TP_LOGGER_BUS_NAME,
       "object-path", TP_LOGGER_OBJECT_PATH,
       "factory", factory,
diff --git a/telepathy-glib/tls-certificate.c b/telepathy-glib/tls-certificate.c
index e54f54c3d..8ea47c74b 100644
--- a/telepathy-glib/tls-certificate.c
+++ b/telepathy-glib/tls-certificate.c
@@ -621,7 +621,6 @@ _tp_tls_certificate_new (TpProxy *conn_or_chan,
 
   retval = g_object_new (TP_TYPE_TLS_CERTIFICATE,
       "parent", conn_or_chan,
-      "dbus-daemon", tp_proxy_get_dbus_daemon (conn_or_chan),
       "bus-name", tp_proxy_get_bus_name (conn_or_chan),
       "object-path", object_path,
       "factory", tp_proxy_get_factory (conn_or_chan),
diff --git a/telepathy-logger/test-api.c b/telepathy-logger/test-api.c
index ce654f51d..ac1b5e2ad 100644
--- a/telepathy-logger/test-api.c
+++ b/telepathy-logger/test-api.c
@@ -34,7 +34,7 @@ static GMainLoop *mainloop = NULL;
 int
 main (int argc, char *argv[])
 {
-  TpDBusDaemon *bus;
+  TpClientFactory *factory;
   TpProxy *proxy;
   GError *error = NULL;
   char *account;
@@ -49,16 +49,16 @@ main (int argc, char *argv[])
 
   account = g_strdup_printf ("%s%s", TP_ACCOUNT_OBJECT_PATH_BASE, argv[1]);
 
-  bus = tp_dbus_daemon_dup (&error);
+  factory = tp_client_factory_dup (&error);
   g_assert_no_error (error);
 
   proxy = g_object_new (TP_TYPE_PROXY,
       "bus-name", TPL_DBUS_SRV_WELL_KNOWN_BUS_NAME,
       "object-path", TPL_DBUS_SRV_OBJECT_PATH,
-      "dbus-daemon", bus,
+      "factory", factory,
       NULL);
 
-  g_object_unref (bus);
+  g_object_unref (factory);
 
   tp_proxy_add_interface_by_id (proxy, TPL_IFACE_QUARK_LOGGER);
 
diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c
index abca8facb..a6bd45cc3 100644
--- a/tests/dbus/account-channel-request.c
+++ b/tests/dbus/account-channel-request.c
@@ -853,7 +853,6 @@ test_handle_delegated (Test *test,
   g_assert (TP_IS_BASE_CLIENT (base_client));
 
   client = tp_tests_object_new_static_class (TP_TYPE_CLIENT,
-      "dbus-daemon", tp_base_client_get_dbus_daemon (base_client),
       "bus-name", tp_base_client_get_bus_name (base_client),
       "object-path",  tp_base_client_get_object_path (base_client),
       "factory", tp_proxy_get_factory (test->account),
diff --git a/tests/dbus/call-cancellation.c b/tests/dbus/call-cancellation.c
index 3cd107309..55a529fa1 100644
--- a/tests/dbus/call-cancellation.c
+++ b/tests/dbus/call-cancellation.c
@@ -241,17 +241,13 @@ new_proxy (Fixture *f,
     int which)
 {
   TpClientFactory *local_factory;
-  TpDBusDaemon *local_dbus_daemon;
 
   if (which == TEST_F)
     local_factory = f->private_factory;
   else
     local_factory = f->factory;
 
-  local_dbus_daemon = tp_client_factory_get_dbus_daemon (local_factory);
-
   return tp_tests_object_new_static_class (TP_TYPE_PROXY,
-      "dbus-daemon", local_dbus_daemon,
       "bus-name", tp_dbus_daemon_get_unique_name (
           tp_client_factory_get_dbus_daemon (f->factory)),
       "object-path", "/",
diff --git a/tests/dbus/call-channel.c b/tests/dbus/call-channel.c
index 9af965f09..114f30646 100644
--- a/tests/dbus/call-channel.c
+++ b/tests/dbus/call-channel.c
@@ -387,7 +387,6 @@ run_until_active_get_all_cb (TpProxy *proxy,
       TpProxy *endpoint;
 
       endpoint = g_object_new (TP_TYPE_PROXY,
-          "dbus-daemon", tp_proxy_get_dbus_daemon (proxy),
           "bus-name", tp_proxy_get_bus_name (proxy),
           "object-path", object_path,
           "factory", tp_proxy_get_factory (proxy),
diff --git a/tests/dbus/client.c b/tests/dbus/client.c
index 4b4b4aa0f..ba25b913b 100644
--- a/tests/dbus/client.c
+++ b/tests/dbus/client.c
@@ -59,7 +59,6 @@ test_new (Test *test,
           gconstpointer data G_GNUC_UNUSED)
 {
   test->client = tp_tests_object_new_static_class (TP_TYPE_CLIENT,
-      "dbus-daemon", tp_client_factory_get_dbus_daemon (test->factory),
       "object-path", "/im/telepathy/v1/Client/whatever",
       "bus-name", "im.telepathy.v1.Client.whatever",
       "factory", test->factory,
diff --git a/tests/dbus/disconnection.c b/tests/dbus/disconnection.c
index ce1fcbaf4..4e3c2dfaf 100644
--- a/tests/dbus/disconnection.c
+++ b/tests/dbus/disconnection.c
@@ -198,17 +198,13 @@ new_proxy (Fixture *f,
     int which)
 {
   TpClientFactory *local_factory;
-  TpDBusDaemon *local_dbus_daemon;
 
   if (which == TEST_F)
     local_factory = f->private_factory;
   else
     local_factory = f->factory;
 
-  local_dbus_daemon = tp_client_factory_get_dbus_daemon (local_factory);
-
   return tp_tests_object_new_static_class (TP_TYPE_PROXY,
-      "dbus-daemon", local_dbus_daemon,
       "bus-name", tp_dbus_daemon_get_unique_name (
           tp_client_factory_get_dbus_daemon (f->factory)),
       "object-path", "/",
diff --git a/tests/dbus/properties.c b/tests/dbus/properties.c
index d055bee45..d8bb1ac5c 100644
--- a/tests/dbus/properties.c
+++ b/tests/dbus/properties.c
@@ -241,7 +241,6 @@ main (int argc, char **argv)
 
   /* Open a D-Bus connection to myself */
   ctx.proxy = TP_PROXY (tp_tests_object_new_static_class (TP_TYPE_PROXY,
-      "dbus-daemon", dbus_daemon,
       "bus-name", tp_dbus_daemon_get_unique_name (dbus_daemon),
       "object-path", "/",
       "factory", factory,
diff --git a/tests/dbus/proxy-preparation.c b/tests/dbus/proxy-preparation.c
index ed54b7611..0ede94f96 100644
--- a/tests/dbus/proxy-preparation.c
+++ b/tests/dbus/proxy-preparation.c
@@ -45,7 +45,6 @@ create_my_conn (Test *test)
   factory = tp_client_factory_new (test->dbus);
   test->my_conn = g_object_new (TP_TESTS_TYPE_MY_CONN_PROXY,
       "factory", factory,
-      "dbus-daemon", test->dbus,
       "bus-name", tp_proxy_get_bus_name (test->connection),
       "object-path", tp_proxy_get_object_path (test->connection),
       NULL);
diff --git a/tests/dbus/simple-approver.c b/tests/dbus/simple-approver.c
index 1125a101b..7a3fcc732 100644
--- a/tests/dbus/simple-approver.c
+++ b/tests/dbus/simple-approver.c
@@ -184,7 +184,6 @@ create_simple_approver (Test *test,
 
   /* Create client-side Client object */
   test->client = tp_tests_object_new_static_class (TP_TYPE_CLIENT,
-          "dbus-daemon", test->dbus,
           "bus-name", tp_base_client_get_bus_name (test->simple_approver),
           "object-path", tp_base_client_get_object_path (test->simple_approver),
           "factory", test->factory,
diff --git a/tests/dbus/simple-handler.c b/tests/dbus/simple-handler.c
index 66daaaaf3..5d435737a 100644
--- a/tests/dbus/simple-handler.c
+++ b/tests/dbus/simple-handler.c
@@ -185,7 +185,6 @@ create_simple_handler (Test *test,
 
  /* Create client-side Client object */
   test->client = tp_tests_object_new_static_class (TP_TYPE_CLIENT,
-          "dbus-daemon", test->dbus,
           "bus-name", tp_base_client_get_bus_name (test->simple_handler),
           "object-path", tp_base_client_get_object_path (test->simple_handler),
           "factory", test->factory,
diff --git a/tests/dbus/simple-observer.c b/tests/dbus/simple-observer.c
index f9251e466..1b9a31d86 100644
--- a/tests/dbus/simple-observer.c
+++ b/tests/dbus/simple-observer.c
@@ -158,7 +158,6 @@ create_simple_observer (Test *test,
 
  /* Create client-side Client object */
   test->client = tp_tests_object_new_static_class (TP_TYPE_CLIENT,
-          "dbus-daemon", test->dbus,
           "bus-name", tp_base_client_get_bus_name (test->simple_observer),
           "object-path", tp_base_client_get_object_path (test->simple_observer),
           "factory", test->factory,
diff --git a/tests/lib/simple-channel-request.c b/tests/lib/simple-channel-request.c
index 71c0d8f24..e3d225bac 100644
--- a/tests/lib/simple-channel-request.c
+++ b/tests/lib/simple-channel-request.c
@@ -206,7 +206,6 @@ tp_tests_simple_channel_request_proceed (TpSvcChannelRequest *request,
   g_assert (factory != NULL);
 
   client = tp_tests_object_new_static_class (TP_TYPE_CLIENT,
-          "dbus-daemon", tp_client_factory_get_dbus_daemon (factory),
           "bus-name", self->priv->preferred_handler,
           "object-path", client_path,
           "factory", factory,