[Pkg-telepathy-commits] [telepathy-glib-1] 80/212: Rename _new_with_factory() to simply _new()
Simon McVittie
smcv at debian.org
Wed May 14 12:08:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-glib-1.
commit db4bae43414de376e5b1cc23b10867f0f4979ce5
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date: Sun Mar 30 10:07:49 2014 -0400
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.
---
telepathy-glib/account.c | 7 ++-----
telepathy-glib/automatic-client-factory-internal.h | 15 +++++----------
telepathy-glib/automatic-client-factory.c | 10 +++++-----
telepathy-glib/call-channel.c | 3 +--
telepathy-glib/channel-dispatch-operation.c | 9 ++++-----
telepathy-glib/channel-request.c | 10 ++++------
telepathy-glib/channel.c | 3 +--
telepathy-glib/client-factory-internal.h | 22 +++++++++++++---------
telepathy-glib/client-factory.c | 20 ++++++++------------
telepathy-glib/connection.c | 9 ++++-----
telepathy-glib/dbus-tube-channel.c | 4 +---
telepathy-glib/file-transfer-channel.c | 4 +---
telepathy-glib/protocol-internal.h | 10 ----------
telepathy-glib/protocol.c | 6 ++----
telepathy-glib/stream-tube-channel.c | 4 +---
telepathy-glib/text-channel.c | 4 +---
telepathy-logger/call-channel-internal.h | 8 +-------
telepathy-logger/call-channel.c | 14 ++------------
telepathy-logger/client-factory.c | 4 ++--
telepathy-logger/text-channel-internal.h | 8 +-------
telepathy-logger/text-channel.c | 14 ++------------
21 files changed, 61 insertions(+), 127 deletions(-)
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 31393c4..e2f87a6 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -2127,14 +2127,13 @@ tp_account_class_init (TpAccountClass *klass)
}
TpAccount *
-_tp_account_new_with_factory (TpClientFactory *factory,
- TpDBusDaemon *bus_daemon,
+_tp_account_new (TpClientFactory *factory,
const gchar *object_path,
GError **error)
{
TpAccount *self;
- g_return_val_if_fail (TP_IS_DBUS_DAEMON (bus_daemon), NULL);
+ g_return_val_if_fail (TP_IS_CLIENT_FACTORY (factory), NULL);
g_return_val_if_fail (object_path != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -2142,8 +2141,6 @@ _tp_account_new_with_factory (TpClientFactory *factory,
return NULL;
self = TP_ACCOUNT (g_object_new (TP_TYPE_ACCOUNT,
- "dbus-daemon", bus_daemon,
- "dbus-connection", tp_proxy_get_dbus_connection (bus_daemon),
"bus-name", TP_ACCOUNT_MANAGER_BUS_NAME,
"object-path", object_path,
"factory", factory,
diff --git a/telepathy-glib/automatic-client-factory-internal.h b/telepathy-glib/automatic-client-factory-internal.h
index 621f835..94c5b1c 100644
--- a/telepathy-glib/automatic-client-factory-internal.h
+++ b/telepathy-glib/automatic-client-factory-internal.h
@@ -26,36 +26,31 @@
G_BEGIN_DECLS
-TpTextChannel *_tp_text_channel_new_with_factory (
- TpClientFactory *factory,
+TpTextChannel *_tp_text_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
GError **error);
-TpStreamTubeChannel *_tp_stream_tube_channel_new_with_factory (
- TpClientFactory *factory,
+TpStreamTubeChannel *_tp_stream_tube_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
GError **error);
-TpDBusTubeChannel *_tp_dbus_tube_channel_new_with_factory (
- TpClientFactory *factory,
+TpDBusTubeChannel *_tp_dbus_tube_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
GError **error);
-TpFileTransferChannel *_tp_file_transfer_channel_new_with_factory (
- TpClientFactory *factory,
+TpFileTransferChannel *_tp_file_transfer_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
GError **error);
-TpCallChannel *_tp_call_channel_new_with_factory (
- TpClientFactory *factory,
+TpCallChannel *_tp_call_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
diff --git a/telepathy-glib/automatic-client-factory.c b/telepathy-glib/automatic-client-factory.c
index ae53b7d..ab89726 100644
--- a/telepathy-glib/automatic-client-factory.c
+++ b/telepathy-glib/automatic-client-factory.c
@@ -149,33 +149,33 @@ build_channel_type_mapping (void)
{ TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
TP_TYPE_STREAM_TUBE_CHANNEL,
NULL,
- (NewFunc) _tp_stream_tube_channel_new_with_factory,
+ (NewFunc) _tp_stream_tube_channel_new,
{ 0 },
},
{ TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
TP_TYPE_DBUS_TUBE_CHANNEL,
NULL,
- (NewFunc) _tp_dbus_tube_channel_new_with_factory,
+ (NewFunc) _tp_dbus_tube_channel_new,
{ TP_DBUS_TUBE_CHANNEL_FEATURE_CORE,
0 },
},
{ TP_IFACE_CHANNEL_TYPE_TEXT,
TP_TYPE_TEXT_CHANNEL,
NULL,
- (NewFunc) _tp_text_channel_new_with_factory,
+ (NewFunc) _tp_text_channel_new,
{ 0 },
},
{ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
TP_TYPE_FILE_TRANSFER_CHANNEL,
NULL,
- (NewFunc) _tp_file_transfer_channel_new_with_factory,
+ (NewFunc) _tp_file_transfer_channel_new,
{ TP_FILE_TRANSFER_CHANNEL_FEATURE_CORE,
0 },
},
{ TP_IFACE_CHANNEL_TYPE_CALL1,
TP_TYPE_CALL_CHANNEL,
NULL,
- (NewFunc) _tp_call_channel_new_with_factory,
+ (NewFunc) _tp_call_channel_new,
{ TP_CALL_CHANNEL_FEATURE_CORE,
0 },
},
diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c
index 273060b..e973155 100644
--- a/telepathy-glib/call-channel.c
+++ b/telepathy-glib/call-channel.c
@@ -1147,7 +1147,7 @@ tp_call_channel_init (TpCallChannel *self)
}
TpCallChannel *
-_tp_call_channel_new_with_factory (TpClientFactory *factory,
+_tp_call_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
@@ -1162,7 +1162,6 @@ _tp_call_channel_new_with_factory (TpClientFactory *factory,
return g_object_new (TP_TYPE_CALL_CHANNEL,
"connection", conn,
- "dbus-daemon", tp_proxy_get_dbus_daemon (conn),
"bus-name", tp_proxy_get_bus_name (conn),
"object-path", object_path,
"handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
index 283b347..8a7f6f3 100644
--- a/telepathy-glib/channel-dispatch-operation.c
+++ b/telepathy-glib/channel-dispatch-operation.c
@@ -737,8 +737,7 @@ tp_channel_dispatch_operation_class_init (TpChannelDispatchOperationClass *klass
}
TpChannelDispatchOperation *
-_tp_channel_dispatch_operation_new_with_factory (TpClientFactory *factory,
- TpDBusDaemon *bus_daemon,
+_tp_channel_dispatch_operation_new (TpClientFactory *factory,
const gchar *object_path,
GHashTable *immutable_properties,
GError **error)
@@ -746,20 +745,20 @@ _tp_channel_dispatch_operation_new_with_factory (TpClientFactory *factory,
TpChannelDispatchOperation *self;
gchar *unique_name;
- g_return_val_if_fail (bus_daemon != NULL, NULL);
+ g_return_val_if_fail (factory != NULL, NULL);
g_return_val_if_fail (object_path != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (!tp_dbus_check_valid_object_path (object_path, error))
return NULL;
- if (!_tp_dbus_daemon_get_name_owner (bus_daemon, -1,
+ if (!_tp_dbus_daemon_get_name_owner (
+ tp_client_factory_get_dbus_daemon (factory), -1,
TP_CHANNEL_DISPATCHER_BUS_NAME, &unique_name, error))
return NULL;
self = TP_CHANNEL_DISPATCH_OPERATION (g_object_new (
TP_TYPE_CHANNEL_DISPATCH_OPERATION,
- "dbus-daemon", bus_daemon,
"bus-name", unique_name,
"object-path", object_path,
"cdo-properties", immutable_properties,
diff --git a/telepathy-glib/channel-request.c b/telepathy-glib/channel-request.c
index 1953fca..2f5026f 100644
--- a/telepathy-glib/channel-request.c
+++ b/telepathy-glib/channel-request.c
@@ -428,8 +428,7 @@ tp_channel_request_class_init (TpChannelRequestClass *klass)
}
TpChannelRequest *
-_tp_channel_request_new_with_factory (TpClientFactory *factory,
- TpDBusDaemon *bus_daemon,
+_tp_channel_request_new (TpClientFactory *factory,
const gchar *object_path,
GVariant *immutable_properties,
GError **error)
@@ -437,20 +436,19 @@ _tp_channel_request_new_with_factory (TpClientFactory *factory,
TpChannelRequest *self;
gchar *unique_name;
- g_return_val_if_fail (bus_daemon != NULL, NULL);
+ g_return_val_if_fail (factory != NULL, NULL);
g_return_val_if_fail (object_path != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (!tp_dbus_check_valid_object_path (object_path, error))
return NULL;
- if (!_tp_dbus_daemon_get_name_owner (bus_daemon, -1,
+ if (!_tp_dbus_daemon_get_name_owner (
+ tp_client_factory_get_dbus_daemon (factory), -1,
TP_CHANNEL_DISPATCHER_BUS_NAME, &unique_name, error))
return NULL;
self = TP_CHANNEL_REQUEST (g_object_new (TP_TYPE_CHANNEL_REQUEST,
- "dbus-daemon", bus_daemon,
- "dbus-connection", tp_proxy_get_dbus_connection (bus_daemon),
"bus-name", unique_name,
"object-path", object_path,
"immutable-properties", immutable_properties,
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 1fc1238..39c8ca8 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -1417,7 +1417,7 @@ tp_channel_class_init (TpChannelClass *klass)
}
TpChannel *
-_tp_channel_new_with_factory (TpClientFactory *factory,
+_tp_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
@@ -1439,7 +1439,6 @@ _tp_channel_new_with_factory (TpClientFactory *factory,
ret = TP_CHANNEL (g_object_new (TP_TYPE_CHANNEL,
"connection", conn,
- "dbus-daemon", tp_proxy_get_dbus_daemon (conn),
"bus-name", tp_proxy_get_bus_name (conn),
"object-path", object_path,
"handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
diff --git a/telepathy-glib/client-factory-internal.h b/telepathy-glib/client-factory-internal.h
index 09e2537..9466d27 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);
diff --git a/telepathy-glib/client-factory.c b/telepathy-glib/client-factory.c
index e986655..db77792 100644
--- a/telepathy-glib/client-factory.c
+++ b/telepathy-glib/client-factory.c
@@ -209,8 +209,7 @@ create_account_impl (TpClientFactory *self,
GVariant *immutable_properties G_GNUC_UNUSED,
GError **error)
{
- return _tp_account_new_with_factory (self, self->priv->dbus, object_path,
- error);
+ return _tp_account_new (self, object_path, error);
}
static GArray *
@@ -227,8 +226,7 @@ create_connection_impl (TpClientFactory *self,
GVariant *immutable_properties,
GError **error)
{
- return _tp_connection_new_with_factory (self, self->priv->dbus, NULL,
- object_path, error);
+ return _tp_connection_new (self, NULL, object_path, error);
}
static GArray *
@@ -251,8 +249,7 @@ create_channel_impl (TpClientFactory *self,
props = tp_asv_from_vardict (immutable_properties);
- channel = _tp_channel_new_with_factory (self, conn, object_path,
- props, error);
+ channel = _tp_channel_new (self, conn, object_path, props, error);
g_hash_table_unref (props);
return channel;
@@ -397,8 +394,8 @@ create_protocol_impl (TpClientFactory *self,
GVariant *immutable_properties G_GNUC_UNUSED,
GError **error)
{
- return _tp_protocol_new (self->priv->dbus, self, cm_name, protocol_name,
- immutable_properties, error);
+ return _tp_protocol_new (self, cm_name, protocol_name, immutable_properties,
+ error);
}
static GArray *
@@ -1474,8 +1471,7 @@ _tp_client_factory_ensure_channel_request (TpClientFactory *self,
props = tp_asv_to_vardict (immutable_properties);
g_variant_ref_sink (props);
- request = _tp_channel_request_new_with_factory (self, self->priv->dbus,
- object_path, props, error);
+ request = _tp_channel_request_new (self, object_path, props, error);
g_variant_unref (props);
insert_proxy (self, request);
@@ -1519,8 +1515,8 @@ _tp_client_factory_ensure_channel_dispatch_operation (
if (dispatch != NULL)
return g_object_ref (dispatch);
- dispatch = _tp_channel_dispatch_operation_new_with_factory (self,
- self->priv->dbus, object_path, immutable_properties, error);
+ dispatch = _tp_channel_dispatch_operation_new (self, object_path,
+ immutable_properties, error);
insert_proxy (self, dispatch);
return dispatch;
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 26ce932..9e93837 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -1970,8 +1970,7 @@ tp_connection_class_init (TpConnectionClass *klass)
}
TpConnection *
-_tp_connection_new_with_factory (TpClientFactory *factory,
- TpDBusDaemon *dbus,
+_tp_connection_new (TpClientFactory *factory,
const gchar *bus_name,
const gchar *object_path,
GError **error)
@@ -1981,7 +1980,7 @@ _tp_connection_new_with_factory (TpClientFactory *factory,
gchar *dup_unique_name = NULL;
TpConnection *ret = NULL;
- g_return_val_if_fail (TP_IS_DBUS_DAEMON (dbus), NULL);
+ g_return_val_if_fail (TP_IS_CLIENT_FACTORY (factory), NULL);
g_return_val_if_fail (object_path != NULL ||
(bus_name != NULL && bus_name[0] != ':'), NULL);
@@ -2010,7 +2009,8 @@ _tp_connection_new_with_factory (TpClientFactory *factory,
/* Resolve unique name if necessary */
if (bus_name[0] != ':')
{
- if (!_tp_dbus_daemon_get_name_owner (dbus, 2000, bus_name,
+ if (!_tp_dbus_daemon_get_name_owner (
+ tp_client_factory_get_dbus_daemon (factory), 2000, bus_name,
&dup_unique_name, error))
goto finally;
@@ -2025,7 +2025,6 @@ _tp_connection_new_with_factory (TpClientFactory *factory,
goto finally;
ret = TP_CONNECTION (g_object_new (TP_TYPE_CONNECTION,
- "dbus-daemon", dbus,
"bus-name", bus_name,
"object-path", object_path,
"factory", factory,
diff --git a/telepathy-glib/dbus-tube-channel.c b/telepathy-glib/dbus-tube-channel.c
index 8e84753..4c30cbc 100644
--- a/telepathy-glib/dbus-tube-channel.c
+++ b/telepathy-glib/dbus-tube-channel.c
@@ -452,8 +452,7 @@ tp_dbus_tube_channel_init (TpDBusTubeChannel *self)
}
TpDBusTubeChannel *
-_tp_dbus_tube_channel_new_with_factory (
- TpClientFactory *factory,
+_tp_dbus_tube_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
@@ -468,7 +467,6 @@ _tp_dbus_tube_channel_new_with_factory (
return g_object_new (TP_TYPE_DBUS_TUBE_CHANNEL,
"connection", conn,
- "dbus-daemon", tp_proxy_get_dbus_daemon (conn),
"bus-name", tp_proxy_get_bus_name (conn),
"object-path", object_path,
"handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
diff --git a/telepathy-glib/file-transfer-channel.c b/telepathy-glib/file-transfer-channel.c
index 118f434..17cbd81 100644
--- a/telepathy-glib/file-transfer-channel.c
+++ b/telepathy-glib/file-transfer-channel.c
@@ -1038,8 +1038,7 @@ tp_file_transfer_channel_get_feature_quark_core (void)
/* Public methods */
TpFileTransferChannel *
-_tp_file_transfer_channel_new_with_factory (
- TpClientFactory *factory,
+_tp_file_transfer_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
@@ -1054,7 +1053,6 @@ _tp_file_transfer_channel_new_with_factory (
return g_object_new (TP_TYPE_FILE_TRANSFER_CHANNEL,
"connection", conn,
- "dbus-daemon", tp_proxy_get_dbus_daemon (conn),
"bus-name", tp_proxy_get_bus_name (conn),
"object-path", object_path,
"handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
diff --git a/telepathy-glib/protocol-internal.h b/telepathy-glib/protocol-internal.h
index f897af5..3653158 100644
--- a/telepathy-glib/protocol-internal.h
+++ b/telepathy-glib/protocol-internal.h
@@ -34,16 +34,6 @@ struct _TpConnectionManagerParam
guint flags;
};
-gchar *_tp_protocol_build_object_path (const gchar *cm_name,
- const gchar *protocol_name);
-
-TpProtocol * _tp_protocol_new (TpDBusDaemon *dbus,
- TpClientFactory *factory,
- const gchar *cm_name,
- const gchar *protocol_name,
- GVariant *immutable_properties,
- GError **error);
-
GHashTable *_tp_protocol_parse_manager_file (GKeyFile *file,
const gchar *cm_name,
const gchar *group,
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 7ee9e71..17573e7 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -924,8 +924,7 @@ _tp_protocol_build_object_path (const gchar *cm_name,
* Since: 0.99.8
*/
TpProtocol *
-_tp_protocol_new (TpDBusDaemon *dbus,
- TpClientFactory *factory,
+_tp_protocol_new (TpClientFactory *factory,
const gchar *cm_name,
const gchar *protocol_name,
GVariant *immutable_properties,
@@ -938,7 +937,7 @@ _tp_protocol_new (TpDBusDaemon *dbus,
g_return_val_if_fail (immutable_properties == NULL ||
g_variant_is_of_type (immutable_properties, G_VARIANT_TYPE_VARDICT),
NULL);
- g_return_val_if_fail (TP_IS_DBUS_DAEMON (dbus), NULL);
+ g_return_val_if_fail (TP_IS_CLIENT_FACTORY (factory), NULL);
g_return_val_if_fail (factory == NULL || TP_IS_CLIENT_FACTORY (factory),
NULL);
@@ -957,7 +956,6 @@ _tp_protocol_new (TpDBusDaemon *dbus,
object_path = _tp_protocol_build_object_path (cm_name, protocol_name);
ret = TP_PROTOCOL (g_object_new (TP_TYPE_PROTOCOL,
- "dbus-daemon", dbus,
"factory", factory,
"bus-name", bus_name,
"object-path", object_path,
diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
index 3b0bf6c..01f86eb 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -488,8 +488,7 @@ tp_stream_tube_channel_init (TpStreamTubeChannel *self)
}
TpStreamTubeChannel *
-_tp_stream_tube_channel_new_with_factory (
- TpClientFactory *factory,
+_tp_stream_tube_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
@@ -504,7 +503,6 @@ _tp_stream_tube_channel_new_with_factory (
return g_object_new (TP_TYPE_STREAM_TUBE_CHANNEL,
"connection", conn,
- "dbus-daemon", tp_proxy_get_dbus_daemon (conn),
"bus-name", tp_proxy_get_bus_name (conn),
"object-path", object_path,
"handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index 29c84bf..b07a3e1 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -1109,8 +1109,7 @@ tp_text_channel_init (TpTextChannel *self)
}
TpTextChannel *
-_tp_text_channel_new_with_factory (
- TpClientFactory *factory,
+_tp_text_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *immutable_properties,
@@ -1125,7 +1124,6 @@ _tp_text_channel_new_with_factory (
return g_object_new (TP_TYPE_TEXT_CHANNEL,
"connection", conn,
- "dbus-daemon", tp_proxy_get_dbus_daemon (conn),
"bus-name", tp_proxy_get_bus_name (conn),
"object-path", object_path,
"handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
diff --git a/telepathy-logger/call-channel-internal.h b/telepathy-logger/call-channel-internal.h
index 0f7b9a9..dec30a1 100644
--- a/telepathy-logger/call-channel-internal.h
+++ b/telepathy-logger/call-channel-internal.h
@@ -62,13 +62,7 @@ typedef struct
GType _tpl_call_channel_get_type (void);
-TplCallChannel * _tpl_call_channel_new (TpConnection *conn,
- const gchar *object_path,
- GHashTable *tp_chan_props,
- GError **error);
-
-TplCallChannel * _tpl_call_channel_new_with_factory (
- TpClientFactory *factory,
+TplCallChannel * _tpl_call_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *tp_chan_props,
diff --git a/telepathy-logger/call-channel.c b/telepathy-logger/call-channel.c
index a8d65e0..42d003b 100644
--- a/telepathy-logger/call-channel.c
+++ b/telepathy-logger/call-channel.c
@@ -415,6 +415,7 @@ _tpl_call_channel_init (TplCallChannel *self)
/**
* _tpl_call_channel_new:
+ * @factory: a #TpClientFactory
* @conn: TpConnection instance owning the channel
* @object_path: the channel's DBus path
* @tp_chan_props: channel's immutable properties, obtained for example by
@@ -438,17 +439,7 @@ _tpl_call_channel_init (TplCallChannel *self)
* @object_path is not valid.
*/
TplCallChannel *
-_tpl_call_channel_new (TpConnection *conn,
- const gchar *object_path,
- GHashTable *tp_chan_props,
- GError **error)
-{
- return _tpl_call_channel_new_with_factory (NULL, conn, object_path,
- tp_chan_props, error);
-}
-
-TplCallChannel *
-_tpl_call_channel_new_with_factory (TpClientFactory *factory,
+_tpl_call_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *tp_chan_props,
@@ -469,7 +460,6 @@ _tpl_call_channel_new_with_factory (TpClientFactory *factory,
self = g_object_new (TPL_TYPE_CALL_CHANNEL,
"factory", factory,
"connection", conn,
- "dbus-daemon", tp_proxy_get_dbus_daemon (conn),
"bus-name", tp_proxy_get_bus_name (conn),
"object-path", object_path,
"handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
diff --git a/telepathy-logger/client-factory.c b/telepathy-logger/client-factory.c
index 38253a5..91d5f2d 100644
--- a/telepathy-logger/client-factory.c
+++ b/telepathy-logger/client-factory.c
@@ -48,12 +48,12 @@ create_channel_impl (TpClientFactory *self,
if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_TEXT))
{
- channel = (TpChannel *) _tpl_text_channel_new_with_factory (self, conn,
+ channel = (TpChannel *) _tpl_text_channel_new (self, conn,
object_path, asv, error);
}
else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_CALL1))
{
- channel = (TpChannel *) _tpl_call_channel_new_with_factory (self, conn,
+ channel = (TpChannel *) _tpl_call_channel_new (self, conn,
object_path, asv, error);
}
else
diff --git a/telepathy-logger/text-channel-internal.h b/telepathy-logger/text-channel-internal.h
index f4f7db5..c270056 100644
--- a/telepathy-logger/text-channel-internal.h
+++ b/telepathy-logger/text-channel-internal.h
@@ -68,13 +68,7 @@ typedef struct
GType _tpl_text_channel_get_type (void);
-TplTextChannel * _tpl_text_channel_new (TpConnection *conn,
- const gchar *object_path,
- GHashTable *tp_chan_props,
- GError **error);
-
-TplTextChannel * _tpl_text_channel_new_with_factory (
- TpClientFactory *factory,
+TplTextChannel * _tpl_text_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *tp_chan_props,
diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c
index 33895fa..a067f67 100644
--- a/telepathy-logger/text-channel.c
+++ b/telepathy-logger/text-channel.c
@@ -688,6 +688,7 @@ _tpl_text_channel_init (TplTextChannel *self)
/**
* _tpl_text_channel_new:
+ * @factory: a #TpClientFactory
* @conn: TpConnection instance owning the channel
* @object_path: the channel's DBus path
* @tp_chan_props: channel's immutable properties, obtained for example by
@@ -711,17 +712,7 @@ _tpl_text_channel_init (TplTextChannel *self)
* Returns: the TplTextChannel instance or %NULL if @object_path is not valid
*/
TplTextChannel *
-_tpl_text_channel_new (TpConnection *conn,
- const gchar *object_path,
- GHashTable *tp_chan_props,
- GError **error)
-{
- return _tpl_text_channel_new_with_factory (NULL, conn, object_path,
- tp_chan_props, error);
-}
-
-TplTextChannel *
-_tpl_text_channel_new_with_factory (TpClientFactory *factory,
+_tpl_text_channel_new (TpClientFactory *factory,
TpConnection *conn,
const gchar *object_path,
const GHashTable *tp_chan_props,
@@ -742,7 +733,6 @@ _tpl_text_channel_new_with_factory (TpClientFactory *factory,
/* TpChannel properties */
"factory", factory,
"connection", conn,
- "dbus-daemon", tp_proxy_get_dbus_daemon (conn),
"bus-name", tp_proxy_get_bus_name (conn),
"object-path", object_path,
"handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git
More information about the Pkg-telepathy-commits
mailing list