diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2007-05-01 20:18:26 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-05-01 20:18:26 +0800 |
| commit | 8aaf6865026ead0f21a233a2897a89a7de332f5d (patch) | |
| tree | 1eb2237d2e0284e26130361ec8ca68922af6e971 /libempathy/empathy-contact-manager.c | |
| parent | b21403fed48c9b95d32a9b8968ac8f47135fd34f (diff) | |
| download | gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.gz gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.bz2 gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.lz gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.xz gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.tar.zst gsoc2013-empathy-8aaf6865026ead0f21a233a2897a89a7de332f5d.zip | |
[darcs-to-svn @ Connect accounts in empathy-launcher, not in empathy-contact-list]
svn path=/trunk/; revision=14
Diffstat (limited to 'libempathy/empathy-contact-manager.c')
| -rw-r--r-- | libempathy/empathy-contact-manager.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index 4246a03c7..cf5a81fe2 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -24,6 +24,7 @@ #include <string.h> +#include <libtelepathy/tp-helpers.h> #include <libtelepathy/tp-constants.h> #include "empathy-contact-manager.h" @@ -37,8 +38,9 @@ #define DEBUG_DOMAIN "ContactManager" struct _EmpathyContactManagerPriv { - GHashTable *lists; - gboolean setup; + GHashTable *lists; + MissionControl *mc; + gboolean setup; }; typedef struct { @@ -130,7 +132,6 @@ static void empathy_contact_manager_init (EmpathyContactManager *manager) { EmpathyContactManagerPriv *priv; - MissionControl *mc; GSList *accounts, *l; priv = GET_PRIV (manager); @@ -140,14 +141,15 @@ empathy_contact_manager_init (EmpathyContactManager *manager) (GDestroyNotify) g_object_unref, (GDestroyNotify) g_object_unref); - mc = empathy_session_get_mission_control (); + priv->mc = mission_control_new (tp_get_bus ()); - dbus_g_proxy_connect_signal (DBUS_G_PROXY (mc), "AccountStatusChanged", + dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc), + "AccountStatusChanged", G_CALLBACK (contact_manager_status_changed_cb), manager, NULL); /* Get ContactList for existing connections */ - accounts = mission_control_get_online_connections (mc, NULL); + accounts = mission_control_get_online_connections (priv->mc, NULL); for (l = accounts; l; l = l->next) { McAccount *account; @@ -167,6 +169,7 @@ contact_manager_finalize (GObject *object) priv = GET_PRIV (object); g_hash_table_destroy (priv->lists); + g_object_unref (priv->mc); } EmpathyContactManager * |