aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-02-11 21:29:02 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-25 15:22:41 +0800
commit64d8e268e6be5afc2afd80ff93d9803318dc5953 (patch)
treee11250b06398ad3c24a5bfe80e59ab81c3325c11 /libempathy
parent21bde4f1a8c82330ccb49eb6bdc00a14de7595aa (diff)
downloadgsoc2013-empathy-64d8e268e6be5afc2afd80ff93d9803318dc5953.tar
gsoc2013-empathy-64d8e268e6be5afc2afd80ff93d9803318dc5953.tar.gz
gsoc2013-empathy-64d8e268e6be5afc2afd80ff93d9803318dc5953.tar.bz2
gsoc2013-empathy-64d8e268e6be5afc2afd80ff93d9803318dc5953.tar.lz
gsoc2013-empathy-64d8e268e6be5afc2afd80ff93d9803318dc5953.tar.xz
gsoc2013-empathy-64d8e268e6be5afc2afd80ff93d9803318dc5953.tar.zst
gsoc2013-empathy-64d8e268e6be5afc2afd80ff93d9803318dc5953.zip
Use the EmpathyChannelFactory with all components creating EmpathyTpChat
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-chatroom-manager.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 7872bbb19..53786343b 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -37,6 +37,7 @@
#include "empathy-tp-chat.h"
#include "empathy-chatroom-manager.h"
+#include "empathy-channel-factory.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
@@ -538,6 +539,7 @@ empathy_chatroom_manager_constructor (GType type,
EmpathyChatroomManagerPriv *priv;
GError *error = NULL;
TpDBusDaemon *dbus;
+ EmpathyChannelFactory *factory;
if (chatroom_manager_singleton != NULL)
return g_object_ref (chatroom_manager_singleton);
@@ -597,6 +599,11 @@ empathy_chatroom_manager_constructor (GType type,
tp_base_client_add_connection_features_varargs (priv->observer,
TP_CONNECTION_FEATURE_CAPABILITIES, NULL);
+ factory = empathy_channel_factory_dup ();
+
+ tp_base_client_set_channel_factory (priv->observer,
+ TP_CLIENT_CHANNEL_FACTORY (factory));
+
if (!tp_base_client_register (priv->observer, &error))
{
g_critical ("Failed to register Observer: %s", error->message);
@@ -604,6 +611,7 @@ empathy_chatroom_manager_constructor (GType type,
g_error_free (error);
}
+ g_object_unref (factory);
return obj;
}