From aa76fd1782f7ab3c7ebf031065722f394961e37a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 14:05:02 -0400 Subject: Moving the building of the EmpathyAccountManager to it's own function. --- src/status-provider-mc5.c | 24 +++++++++++++++++++----- src/status-provider-mc5.h | 4 ++-- 2 files changed, 21 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index 671e459..e277fc7 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -104,6 +104,23 @@ status_provider_mc5_class_init (StatusProviderMC5Class *klass) return; } +/* Build our empathy account manager instance if we don't + have one. */ +static void +build_eam (StatusProviderMC5 * self) +{ + StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self); + + if (priv->manager != NULL) { + return; + } + + priv->manager = EMPATHY_ACCOUNT_MANAGER(g_object_new(EMPATHY_TYPE_ACCOUNT_MANAGER, NULL)); + g_signal_connect(G_OBJECT(priv->manager), "global-presence-changed", G_CALLBACK(presence_changed), self); + + return; +} + /* Creating an instance of the status provider. We set the variables and create an EmpathyAccountManager object. It does all the hard work in this module of tracking MissionControl and enumerating the @@ -116,8 +133,6 @@ status_provider_mc5_init (StatusProviderMC5 *self) priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; priv->manager = NULL; - g_signal_connect(G_OBJECT(priv->manager), "global-presence-changed", G_CALLBACK(presence_changed), self); - return; } @@ -168,9 +183,8 @@ static void set_status (StatusProvider * sp, StatusProviderStatus status) { StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp); - if (priv->manager == NULL) { - priv->manager = EMPATHY_ACCOUNT_MANAGER(g_object_new(EMPATHY_TYPE_ACCOUNT_MANAGER, NULL)); - } + + build_eam(STATUS_PROVIDER_MC5(sp)); empathy_account_manager_request_global_presence(priv->manager, sp_to_tp_map[status], sp_to_mc_map[status], ""); diff --git a/src/status-provider-mc5.h b/src/status-provider-mc5.h index 2c03729..4d5659d 100644 --- a/src/status-provider-mc5.h +++ b/src/status-provider-mc5.h @@ -31,8 +31,8 @@ with this program. If not, see . G_BEGIN_DECLS #define STATUS_PROVIDER_MC5_TYPE (status_provider_mc5_get_type ()) -#define STATUS_PROVIDER_MC5(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), STATUS_PROVIDER_MC5_TYPE, StatusProviderTelepathy)) -#define STATUS_PROVIDER_MC5_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), STATUS_PROVIDER_MC5_TYPE, StatusProviderTelepathyClass)) +#define STATUS_PROVIDER_MC5(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), STATUS_PROVIDER_MC5_TYPE, StatusProviderMC5)) +#define STATUS_PROVIDER_MC5_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), STATUS_PROVIDER_MC5_TYPE, StatusProviderMC5Class)) #define IS_STATUS_PROVIDER_MC5(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), STATUS_PROVIDER_MC5_TYPE)) #define IS_STATUS_PROVIDER_MC5_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), STATUS_PROVIDER_MC5_TYPE)) #define STATUS_PROVIDER_MC5_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), STATUS_PROVIDER_MC5_TYPE, StatusProviderMC5Class)) -- cgit v1.2.3 From 7c7df5ba849f15cb2772a8370d02506e4fc5f91c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 15:00:27 -0400 Subject: Adding a dbus proxy and setting up a signal handler for the namechange event which will start or stop the empathy account manager. --- src/status-provider-mc5.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'src') diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index e277fc7..46d5562 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -66,6 +66,7 @@ typedef struct _StatusProviderMC5Private StatusProviderMC5Private; struct _StatusProviderMC5Private { EmpathyAccountManager * manager; StatusProviderStatus status; + DBusGProxy * dbus_proxy; }; #define STATUS_PROVIDER_MC5_GET_PRIVATE(o) \ @@ -81,6 +82,7 @@ static void status_provider_mc5_finalize (GObject *object); static void set_status (StatusProvider * sp, StatusProviderStatus status); static StatusProviderStatus get_status (StatusProvider * sp); static void presence_changed (EmpathyAccountManager * eam, guint type, const gchar * type_str, const gchar * message, StatusProviderMC5 * sp); +static void dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, StatusProviderMC5 * self); G_DEFINE_TYPE (StatusProviderMC5, status_provider_mc5, STATUS_PROVIDER_TYPE); @@ -133,6 +135,32 @@ status_provider_mc5_init (StatusProviderMC5 *self) priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; priv->manager = NULL; + DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + g_return_if_fail(bus != NULL); /* Can't do anymore DBus stuff without this, + all non-DBus stuff should be done */ + + GError * error = NULL; + + /* Set up the dbus Proxy */ + priv->dbus_proxy = dbus_g_proxy_new_for_name_owner (bus, + DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, + &error); + if (error != NULL) { + g_warning("Unable to connect to DBus events: %s", error->message); + g_error_free(error); + return; + } + + /* Configure the name owner changing */ + dbus_g_proxy_add_signal(priv->dbus_proxy, "NameOwnerChanged", + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_INVALID); + dbus_g_proxy_connect_signal(priv->dbus_proxy, "NameOwnerChanged", + G_CALLBACK(dbus_namechange), + self, NULL); + return; } @@ -148,6 +176,11 @@ status_provider_mc5_dispose (GObject *object) priv->manager = NULL; } + if (priv->dbus_proxy != NULL) { + g_object_unref(priv->dbus_proxy); + priv->dbus_proxy = NULL; + } + G_OBJECT_CLASS (status_provider_mc5_parent_class)->dispose (object); return; } @@ -161,6 +194,27 @@ status_provider_mc5_finalize (GObject *object) return; } +#define MC5_WELL_KNOWN_NAME "org.freedesktop.Telepathy.MissionControl5" +/* Watch for MC5 Coming on and off the bus. */ +static void +dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, StatusProviderMC5 * self) +{ + if (new != NULL && g_strcmp0(name, MC5_WELL_KNOWN_NAME) == 0) { + g_debug("MC5 Coming online"); + build_eam(self); + } + if (prev != NULL && g_strcmp0(name, MC5_WELL_KNOWN_NAME) == 0) { + g_debug("MC5 going offline"); + StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self); + if (priv->manager != NULL) { + g_object_unref(priv->manager); + priv->manager = NULL; + } + } + + return; +} + /** status_provider_mc5_new: -- cgit v1.2.3