diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-01-10 00:15:21 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-10 00:15:21 +0800 |
| commit | 2f64945c0d6bef54f79ba32b8c2a6be692a31bb5 (patch) | |
| tree | c1d04c69a1e15acc119982f81d0647a95c7d60ea /libempathy | |
| parent | 1991fd5404adbc78e244cd38c7aa297c4933aef1 (diff) | |
| download | gsoc2013-empathy-2f64945c0d6bef54f79ba32b8c2a6be692a31bb5.tar gsoc2013-empathy-2f64945c0d6bef54f79ba32b8c2a6be692a31bb5.tar.gz gsoc2013-empathy-2f64945c0d6bef54f79ba32b8c2a6be692a31bb5.tar.bz2 gsoc2013-empathy-2f64945c0d6bef54f79ba32b8c2a6be692a31bb5.tar.lz gsoc2013-empathy-2f64945c0d6bef54f79ba32b8c2a6be692a31bb5.tar.xz gsoc2013-empathy-2f64945c0d6bef54f79ba32b8c2a6be692a31bb5.tar.zst gsoc2013-empathy-2f64945c0d6bef54f79ba32b8c2a6be692a31bb5.zip | |
Initialise the chatroom manager from empathy itself
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2186
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index f004db0cb..0d67336c7 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -57,7 +57,6 @@ typedef struct { GHashTable *accounts; gpointer token; GSList *tubes; - EmpathyChatroomManager *chatroom_mgr; } EmpathyDispatcherPriv; G_DEFINE_TYPE (EmpathyDispatcher, empathy_dispatcher, G_TYPE_OBJECT); @@ -820,9 +819,8 @@ dispatcher_finalize (GObject *object) g_object_unref (priv->account_manager); g_object_unref (priv->mc); + g_hash_table_destroy (priv->accounts); g_hash_table_destroy (priv->connections); - - g_object_unref (priv->chatroom_mgr); } static void @@ -896,10 +894,6 @@ empathy_dispatcher_init (EmpathyDispatcher *dispatcher) g_object_unref (l->data); } g_list_free (accounts); - - /* FIXME thisshould probably be created by another object.. */ - priv->chatroom_mgr = empathy_chatroom_manager_dup_singleton (NULL); - empathy_chatroom_manager_observe (priv->chatroom_mgr, dispatcher); } EmpathyDispatcher * |