aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-09-10 14:04:51 -0500
committerTed Gould <ted@canonical.com>2009-09-10 14:04:51 -0500
commitb93e75aaa4634ac8f995ac3ea7596e3946a59e18 (patch)
tree86fb8bd23ffa7dea7d6156fd185212e1924a8761
parentff14ae64765101fc90581d5b927d68ce2b15297c (diff)
downloadayatana-indicator-session-b93e75aaa4634ac8f995ac3ea7596e3946a59e18.tar.gz
ayatana-indicator-session-b93e75aaa4634ac8f995ac3ea7596e3946a59e18.tar.bz2
ayatana-indicator-session-b93e75aaa4634ac8f995ac3ea7596e3946a59e18.zip
Watching for Mission Control comming on the bus.
-rw-r--r--src/status-provider-telepathy.c46
1 files changed, 46 insertions, 0 deletions
diff --git a/src/status-provider-telepathy.c b/src/status-provider-telepathy.c
index 58bc6ca..f33e26f 100644
--- a/src/status-provider-telepathy.c
+++ b/src/status-provider-telepathy.c
@@ -62,6 +62,7 @@ static mc_status_t sp_to_mc_map[] = {
typedef struct _StatusProviderTelepathyPrivate StatusProviderTelepathyPrivate;
struct _StatusProviderTelepathyPrivate {
DBusGProxy * proxy;
+ DBusGProxy * dbus_proxy;
mc_status_t mc_status;
};
@@ -76,6 +77,7 @@ static void status_provider_telepathy_dispose (GObject *object);
static void status_provider_telepathy_finalize (GObject *object);
/* Internal Funcs */
static void build_telepathy_proxy (StatusProviderTelepathy * self);
+static void dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, StatusProviderTelepathy * self);
static void set_status (StatusProvider * sp, StatusProviderStatus status);
static StatusProviderStatus get_status (StatusProvider * sp);
static void changed_status (DBusGProxy * proxy, guint status, gchar * message, StatusProvider * sp);
@@ -109,8 +111,39 @@ status_provider_telepathy_init (StatusProviderTelepathy *self)
StatusProviderTelepathyPrivate * priv = STATUS_PROVIDER_TELEPATHY_GET_PRIVATE(self);
priv->proxy = NULL;
+ priv->dbus_proxy = NULL;
priv->mc_status = MC_STATUS_OFFLINE;
+ GError * error = NULL;
+
+ /* Grabbing the session bus */
+ DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+ if (bus == NULL) {
+ g_warning("Unable to connect to Session Bus: %s", error == NULL ? "No message" : error->message);
+ g_error_free(error);
+ return;
+ }
+
+ /* 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);
+
build_telepathy_proxy(self);
return;
@@ -184,6 +217,19 @@ build_telepathy_proxy (StatusProviderTelepathy * self)
return;
}
+/* Watch to see if the Mission Control comes up on Dbus */
+static void
+dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, StatusProviderTelepathy * self)
+{
+ g_return_if_fail(name != NULL);
+ g_return_if_fail(new != NULL);
+
+ if (g_strcmp0(name, "org.freedesktop.Telepathy.MissionControl") == 0) {
+ build_telepathy_proxy(self);
+ }
+ return;
+}
+
static void
status_provider_telepathy_dispose (GObject *object)
{