aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-08-24 21:52:26 -0500
committerTed Gould <ted@canonical.com>2009-08-24 21:52:26 -0500
commitce1f33170639cdc65e5655643a2d466123706f12 (patch)
tree1ac539058e1190695bc3c2d1e9924cdab220c311
parent95190bc550383beb535ce52d66d3d0d7f46c0021 (diff)
downloadayatana-indicator-session-ce1f33170639cdc65e5655643a2d466123706f12.tar.gz
ayatana-indicator-session-ce1f33170639cdc65e5655643a2d466123706f12.tar.bz2
ayatana-indicator-session-ce1f33170639cdc65e5655643a2d466123706f12.zip
Support for setting status stollen from FUSA status manager (written by me) and signal handling
-rw-r--r--src/status-provider-telepathy.c53
1 files changed, 52 insertions, 1 deletions
diff --git a/src/status-provider-telepathy.c b/src/status-provider-telepathy.c
index 334126b..2c6453f 100644
--- a/src/status-provider-telepathy.c
+++ b/src/status-provider-telepathy.c
@@ -189,9 +189,58 @@ static void
set_status (StatusProvider * sp, StatusProviderStatus status)
{
StatusProviderTelepathyPrivate * priv = STATUS_PROVIDER_TELEPATHY_GET_PRIVATE(sp);
+ if (priv->proxy == NULL) {
+ priv->mc_status = MC_STATUS_OFFLINE;
+ return;
+ }
+
priv->mc_status = sp_to_mc_map[status];
+
+ guint mcstatus = MC_STATUS_UNSET;
+ gboolean ret = FALSE;
+ GError * error = NULL;
+
+ ret = dbus_g_proxy_call(priv->proxy,
+ "GetPresence", &error,
+ G_TYPE_INVALID,
+ G_TYPE_UINT, &priv->mc_status,
+ G_TYPE_INVALID);
+
+ /* If we can't get the get call to work, let's not set */
+ if (!ret) {
+ if (error != NULL) {
+ g_error_free(error);
+ }
+ return;
+ }
+
+ /* If the get call doesn't return a status, that means that there
+ are no clients connected. We don't want to connect them by telling
+ MC that we're going online -- we'd like to be more passive than that. */
+ if (mcstatus == MC_STATUS_UNSET) {
+ return;
+ }
+
+ ret = dbus_g_proxy_call(priv->proxy,
+ "SetPresence", &error,
+ G_TYPE_UINT, priv->mc_status,
+ G_TYPE_STRING, "",
+ G_TYPE_INVALID,
+ G_TYPE_INVALID);
+
+ if (!ret) {
+ if (error != NULL) {
+ g_warning("Unable to set Mission Control Presence: %s", error->message);
+ g_error_free(error);
+ } else {
+ g_warning("Unable to set Mission Control Presence");
+ }
+ return;
+ }
+
return;
}
+
static StatusProviderStatus
get_status (StatusProvider * sp)
{
@@ -207,7 +256,9 @@ get_status (StatusProvider * sp)
static void
changed_status (DBusGProxy * proxy, guint status, gchar * message, StatusProvider * sp)
{
- g_signal_emit(G_OBJECT(sp), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, STATUS_PROVIDER_STATUS_OFFLINE, TRUE);
+ StatusProviderTelepathyPrivate * priv = STATUS_PROVIDER_TELEPATHY_GET_PRIVATE(sp);
+ priv->mc_status = status;
+ g_signal_emit(G_OBJECT(sp), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, mc_to_sp_map[priv->mc_status], TRUE);
}
static void