Rename _new_with_factory() to simply _new()

Proxies are not always created with a factory so it's not a special
constructor anymore.

This also removes the TpDBusDaemon argument because TpProxy::constructed
will fill it itself from the factory anyway.

1 files changed, 13 insertions, 9 deletions

diff --git a/telepathy-glib/client-factory-internal.h b/telepathy-glib/client-factory-internal.h
index 09e2537ab..9466d275b 100644
--- a/telepathy-glib/client-factory-internal.h
+++ b/telepathy-glib/client-factory-internal.h
@@ -41,37 +41,41 @@ _tp_client_factory_ensure_channel_dispatch_operation (TpClientFactory *self,
     GHashTable *immutable_properties,
     GError **error);
 
-TpAccount *_tp_account_new_with_factory (TpClientFactory *factory,
-    TpDBusDaemon *bus_daemon,
+TpAccount *_tp_account_new (TpClientFactory *factory,
     const gchar *object_path,
     GError **error);
 
-TpConnection *_tp_connection_new_with_factory (TpClientFactory *factory,
-    TpDBusDaemon *dbus,
+TpConnection *_tp_connection_new (TpClientFactory *factory,
     const gchar *bus_name,
     const gchar *object_path,
     GError **error);
 
-TpChannel *_tp_channel_new_with_factory (TpClientFactory *factory,
+TpChannel *_tp_channel_new (TpClientFactory *factory,
     TpConnection *conn,
     const gchar *object_path,
     const GHashTable *immutable_properties,
     GError **error);
 
-TpChannelRequest *_tp_channel_request_new_with_factory (
+TpChannelRequest *_tp_channel_request_new (
     TpClientFactory *factory,
-    TpDBusDaemon *bus_daemon,
     const gchar *object_path,
     GVariant *immutable_properties,
     GError **error);
 
-TpChannelDispatchOperation *_tp_channel_dispatch_operation_new_with_factory (
+TpChannelDispatchOperation *_tp_channel_dispatch_operation_new (
     TpClientFactory *factory,
-    TpDBusDaemon *bus_daemon,
     const gchar *object_path,
     GHashTable *immutable_properties,
     GError **error);
 
+TpProtocol * _tp_protocol_new (TpClientFactory *factory,
+    const gchar *cm_name,
+    const gchar *protocol_name,
+    GVariant *immutable_properties,
+    GError **error);
+gchar *_tp_protocol_build_object_path (const gchar *cm_name,
+    const gchar *protocol_name);
+
 TpTLSCertificate *_tp_tls_certificate_new (TpProxy *conn_or_chan,
     const gchar *object_path,
     GError **error);