diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
commit | 894b1f315b62499a5d305aff6b937093a20df1a4 (patch) | |
tree | 8cecdaff46a2ee3360f9e676d11672c388a23082 /libempathy/empathy-client-factory.c | |
parent | 58574c8dc2e5261d8c89b9a6b6fda41687a386ea (diff) | |
parent | 1af2b9b657046268d0a44fd2aa588ea281ad1f20 (diff) | |
download | gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.gz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.bz2 gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.lz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.xz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.zst gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.zip |
Merge remote-tracking branch 'origin/call1' into master+call
Conflicts:
configure.ac
telepathy-yell
Diffstat (limited to 'libempathy/empathy-client-factory.c')
-rw-r--r-- | libempathy/empathy-client-factory.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c index 294eaf5ff..2a8559441 100644 --- a/libempathy/empathy-client-factory.c +++ b/libempathy/empathy-client-factory.c @@ -26,42 +26,12 @@ #include "empathy-tp-chat.h" #include "empathy-utils.h" -#include <telepathy-yell/telepathy-yell.h> - G_DEFINE_TYPE (EmpathyClientFactory, empathy_client_factory, TP_TYPE_AUTOMATIC_CLIENT_FACTORY) #define chainup ((TpSimpleClientFactoryClass *) \ empathy_client_factory_parent_class) -/* FIXME: move to yell */ -static TpyCallChannel * -call_channel_new_with_factory (TpSimpleClientFactory *factory, - TpConnection *conn, - const gchar *object_path, - const GHashTable *immutable_properties, - GError **error) -{ - TpProxy *conn_proxy = (TpProxy *) conn; - - g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL); - g_return_val_if_fail (object_path != NULL, NULL); - g_return_val_if_fail (immutable_properties != NULL, NULL); - - if (!tp_dbus_check_valid_object_path (object_path, error)) - return NULL; - - return g_object_new (TPY_TYPE_CALL_CHANNEL, - "factory", factory, - "connection", conn, - "dbus-daemon", conn_proxy->dbus_daemon, - "bus-name", conn_proxy->bus_name, - "object-path", object_path, - "handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE, - "channel-properties", immutable_properties, - NULL); -} - static TpChannel * empathy_client_factory_create_channel (TpSimpleClientFactory *factory, TpConnection *conn, @@ -83,11 +53,6 @@ empathy_client_factory_create_channel (TpSimpleClientFactory *factory, TP_SIMPLE_CLIENT_FACTORY (factory), account, conn, path, properties)); } - else if (!tp_strdiff (chan_type, TPY_IFACE_CHANNEL_TYPE_CALL)) - { - return TP_CHANNEL (call_channel_new_with_factory ( - TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error)); - } return chainup->create_channel (factory, conn, path, properties, error); } |