aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-08-08 14:54:51 -0600
committerTed Gould <ted@canonical.com>2009-08-08 14:54:51 -0600
commitc269d95ff563c71713949bbcefd2456bc1b52628 (patch)
treef08b2824ffbe0e827b8fa44dbfd88f07871b9b77
parent98aa89267118f82a759acd3a2c873b39b940899c (diff)
downloadayatana-indicator-session-c269d95ff563c71713949bbcefd2456bc1b52628.tar.gz
ayatana-indicator-session-c269d95ff563c71713949bbcefd2456bc1b52628.tar.bz2
ayatana-indicator-session-c269d95ff563c71713949bbcefd2456bc1b52628.zip
Cleaning up icon code so that we save the current one incase someone askes.
-rw-r--r--src/status-service-dbus.c32
1 files changed, 28 insertions, 4 deletions
diff --git a/src/status-service-dbus.c b/src/status-service-dbus.c
index 09d2711..65de499 100644
--- a/src/status-service-dbus.c
+++ b/src/status-service-dbus.c
@@ -34,7 +34,7 @@ static void status_service_dbus_init (StatusServiceDbus *self);
static void status_service_dbus_dispose (GObject *object);
static void status_service_dbus_finalize (GObject *object);
static gboolean _status_service_server_watch (StatusServiceDbus * service, GError ** error);
-static gboolean _status_service_server_status_icons (StatusServiceDbus * service, GArray * array, GError ** error);
+static gboolean _status_service_server_status_icons (StatusServiceDbus * service, gchar ** icon, GError ** error);
static gboolean _status_service_server_pretty_user_name (StatusServiceDbus * service, gchar ** username, GError ** error);
#include "status-service-server.h"
@@ -44,6 +44,7 @@ typedef struct _StatusServiceDbusPrivate StatusServiceDbusPrivate;
struct _StatusServiceDbusPrivate
{
gchar * name;
+ gchar * icon;
};
#define STATUS_SERVICE_DBUS_GET_PRIVATE(o) \
@@ -120,7 +121,8 @@ status_service_dbus_init (StatusServiceDbus *self)
G_OBJECT(self));
StatusServiceDbusPrivate * priv = STATUS_SERVICE_DBUS_GET_PRIVATE(self);
- priv->name = "test";
+ priv->name = NULL;
+ priv->icon = NULL;
return;
}
@@ -149,8 +151,19 @@ _status_service_server_watch (StatusServiceDbus * service, GError ** error)
}
static gboolean
-_status_service_server_status_icons (StatusServiceDbus * service, GArray * array, GError ** error)
+_status_service_server_status_icons (StatusServiceDbus * service, gchar ** icon, GError ** error)
{
+ if (!IS_STATUS_SERVICE_DBUS(service)) {
+ g_warning("NO BAD EVIL!");
+ return FALSE;
+ }
+
+ StatusServiceDbusPrivate * priv = STATUS_SERVICE_DBUS_GET_PRIVATE(service);
+ if (priv->icon == NULL) {
+ *icon = g_strdup("");
+ } else {
+ *icon = g_strdup(priv->icon);
+ }
return TRUE;
}
@@ -176,6 +189,17 @@ _status_service_server_pretty_user_name (StatusServiceDbus * service, gchar ** u
void
status_service_dbus_set_status (StatusServiceDbus * self, const gchar * icon)
{
- g_signal_emit(G_OBJECT(self), signals[STATUS_ICONS_CHANGED], 0, icon, TRUE);
+ g_return_if_fail(IS_STATUS_SERVICE_DBUS(self));
+
+ g_debug("Setting icon to: %s", icon);
+
+ StatusServiceDbusPrivate * priv = STATUS_SERVICE_DBUS_GET_PRIVATE(self);
+
+ if (priv->icon != NULL) {
+ g_free(priv->icon);
+ }
+ priv->icon = g_strdup(icon);
+
+ g_signal_emit(G_OBJECT(self), signals[STATUS_ICONS_CHANGED], 0, priv->icon, TRUE);
return;
}