diff options
Diffstat (limited to 'src/empathy-call-observer.c')
| -rw-r--r-- | src/empathy-call-observer.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c index 8ce57a3e1..0fecbdca6 100644 --- a/src/empathy-call-observer.c +++ b/src/empathy-call-observer.c @@ -28,7 +28,6 @@ #include <libnotify/notification.h> -#include <libempathy/empathy-channel-factory.h> #include <libempathy/empathy-utils.h> #include <libempathy-gtk/empathy-images.h> @@ -349,31 +348,19 @@ empathy_call_observer_init (EmpathyCallObserver *self) { EmpathyCallObserverPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_CALL_OBSERVER, EmpathyCallObserverPriv); - TpDBusDaemon *dbus; - EmpathyChannelFactory *factory; + TpAccountManager *am; GError *error = NULL; self->priv = priv; self->priv->notify_mgr = empathy_notify_manager_dup_singleton (); - dbus = tp_dbus_daemon_dup (&error); - if (dbus == NULL) - { - DEBUG ("Failed to get TpDBusDaemon: %s", error->message); - g_error_free (error); - return; - } + am = tp_account_manager_dup (); - self->priv->observer = tp_simple_observer_new (dbus, TRUE, + self->priv->observer = tp_simple_observer_new_with_am (am, TRUE, "Empathy.CallObserver", FALSE, observe_channels, self, NULL); - factory = empathy_channel_factory_dup (); - tp_base_client_set_channel_factory (self->priv->observer, - TP_CLIENT_CHANNEL_FACTORY (factory)); - g_object_unref (factory); - /* Observe Call and StreamedMedia channels */ tp_base_client_take_observer_filter (self->priv->observer, tp_asv_new ( @@ -398,7 +385,7 @@ empathy_call_observer_init (EmpathyCallObserver *self) g_error_free (error); } - g_object_unref (dbus); + g_object_unref (am); } EmpathyCallObserver * |