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 From c152f3a0da6cbb83c699d0f26d5a411db3de1e37 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 15:20:04 -0400 Subject: Checking the name we're getting and the name we're loosing. --- src/status-provider-mc5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index 46d5562..a904407 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -199,11 +199,11 @@ status_provider_mc5_finalize (GObject *object) 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) { + if (new != NULL && g_strcmp0(new, MC5_WELL_KNOWN_NAME) == 0) { g_debug("MC5 Coming online"); build_eam(self); } - if (prev != NULL && g_strcmp0(name, MC5_WELL_KNOWN_NAME) == 0) { + if (prev != NULL && g_strcmp0(prev, MC5_WELL_KNOWN_NAME) == 0) { g_debug("MC5 going offline"); StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self); if (priv->manager != NULL) { -- cgit v1.2.3 From 3108cf01e8937eb7a3f826a1c12ca8749f5c6d96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 15:29:26 -0400 Subject: Debug message --- src/status-provider-mc5.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index a904407..068c482 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -199,6 +199,8 @@ status_provider_mc5_finalize (GObject *object) static void dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, StatusProviderMC5 * self) { + g_debug("DBUS NAMECHANGE: %s %s %s", name, prev, new); + if (new != NULL && g_strcmp0(new, MC5_WELL_KNOWN_NAME) == 0) { g_debug("MC5 Coming online"); build_eam(self); -- cgit v1.2.3 From 9d152f3a8ef158e2d99d1e9b1b37c0e56a5c2183 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 15:37:02 -0400 Subject: Dealing with DBus's stupid views of NULL. If I wanted it like that I'd use Python. I have values, or not. Simple as that. --- src/status-provider-mc5.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index 068c482..b254d27 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -199,13 +199,13 @@ status_provider_mc5_finalize (GObject *object) static void dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, StatusProviderMC5 * self) { - g_debug("DBUS NAMECHANGE: %s %s %s", name, prev, new); + /* g_debug("DBUS NAMECHANGE: %s %s %s", name, prev, new); */ - if (new != NULL && g_strcmp0(new, MC5_WELL_KNOWN_NAME) == 0) { + if (prev[0] == '\0' && g_strcmp0(name, MC5_WELL_KNOWN_NAME) == 0) { g_debug("MC5 Coming online"); build_eam(self); } - if (prev != NULL && g_strcmp0(prev, MC5_WELL_KNOWN_NAME) == 0) { + if (new[0] == '\0' && 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) { -- cgit v1.2.3 From 15705bea73cbf6d8a657cb72113bc8bcc1d78816 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 15:47:04 -0400 Subject: Signaling a state change when disconnecting. --- src/status-provider-mc5.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index b254d27..613c3df 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -212,6 +212,9 @@ dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, con g_object_unref(priv->manager); priv->manager = NULL; } + + priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; + g_signal_emit(G_OBJECT(self), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, priv->status, TRUE); } return; -- cgit v1.2.3 From ba6b4a7919e681385be9e412cfd63e488a0fb10b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 16:12:42 -0400 Subject: Checking to see if there is an MC5 there when we start. --- src/status-provider-mc5.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index 613c3df..6154fb7 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -31,6 +31,7 @@ with this program. If not, see . #include "status-provider-mc5-marshal.h" #include +#include static gchar * sp_to_mc_map[STATUS_PROVIDER_STATUS_LAST] = { /* STATUS_PROVIDER_STATUS_ONLINE, */ "available", @@ -71,6 +72,7 @@ struct _StatusProviderMC5Private { #define STATUS_PROVIDER_MC5_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), STATUS_PROVIDER_MC5_TYPE, StatusProviderMC5Private)) +#define MC5_WELL_KNOWN_NAME "org.freedesktop.Telepathy.MissionControl5" /* Prototypes */ /* GObject stuff */ @@ -83,6 +85,7 @@ 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); +static void mc5_exists_cb (DBusGProxy * proxy, gboolean exists, GError * error, gpointer userdata); G_DEFINE_TYPE (StatusProviderMC5, status_provider_mc5, STATUS_PROVIDER_TYPE); @@ -161,6 +164,8 @@ status_provider_mc5_init (StatusProviderMC5 *self) G_CALLBACK(dbus_namechange), self, NULL); + org_freedesktop_DBus_name_has_owner_async(priv->dbus_proxy, MC5_WELL_KNOWN_NAME, mc5_exists_cb, self); + return; } @@ -194,7 +199,6 @@ 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) @@ -220,6 +224,24 @@ dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, con return; } +/* Callback for the Dbus command to do HasOwner on + the MC5 service. If it exists, we want to have an + account manager. */ +static void +mc5_exists_cb (DBusGProxy * proxy, gboolean exists, GError * error, gpointer userdata) +{ + if (error) { + g_warning("Unable to check if MC5 is running: %s", error->message); + return; + } + + if (exists) { + build_eam(STATUS_PROVIDER_MC5(userdata)); + } + + return; +} + /** status_provider_mc5_new: -- cgit v1.2.3