From 9ddd25f8589ae0cd5ec8e09c4c012e4ccac6a416 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 18 Aug 2011 11:31:10 +0200 Subject: Port to new tp-glib client factory - EmpathyChannelFactory has been changed to EmpathyClientFactory and inherit from TpAutomaticClientFactory. - We now always use the _with_am variant of TpSimple* constructors - We define our own factory as default. - Replace empathy_get_account_for_connection() by tp_connection_get_account() - The factory is passed to EmpathyTpChat and TpyCallChannel - Use tp_simple_client_factory_ensure_account() instead of tp_account_manager_ensure_account(). - Rely on the factory to prepare connection features. This should ensure that all the TpProxy and TpContact objects created in Empathy are shared and use EmpathyClientFactory. https://bugzilla.gnome.org/show_bug.cgi?id=655799 --- libempathy-gtk/empathy-log-window.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'libempathy-gtk/empathy-log-window.c') diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 5620f4b7c..d0f57a6de 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -1041,21 +1041,14 @@ observe_channels (TpSimpleObserver *observer, static void log_window_create_observer (EmpathyLogWindow *self) { - TpDBusDaemon *dbus; - GError *error = NULL; + TpAccountManager *am; - dbus = tp_dbus_daemon_dup (&error); + am = tp_account_manager_dup (); - if (dbus == NULL) - { - DEBUG ("Could not connect to the bus: %s", error->message); - g_error_free (error); - return; - } - - self->priv->observer = tp_simple_observer_new (dbus, TRUE, "LogWindow", + self->priv->observer = tp_simple_observer_new_with_am (am, TRUE, "LogWindow", TRUE, observe_channels, g_object_ref (self), g_object_unref); + self->priv->channels = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, g_object_unref); @@ -1077,7 +1070,7 @@ log_window_create_observer (EmpathyLogWindow *self) tp_base_client_register (self->priv->observer, NULL); - g_object_unref (dbus); + g_object_unref (am); } static TplEntity * -- cgit v1.2.3