aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-07-14 16:35:57 +0100
committerConor Curran <conor.curran@canonical.com>2011-07-14 16:35:57 +0100
commitf2d458b0addfe408835366939b49f4a38c0a14cb (patch)
tree2c641dd57d23859a3a9b39173b6800ae8e104e7c /src
parentd8eae0b9560084bc68781d73c14fcb54cd53fd02 (diff)
downloadayatana-indicator-session-f2d458b0addfe408835366939b49f4a38c0a14cb.tar.gz
ayatana-indicator-session-f2d458b0addfe408835366939b49f4a38c0a14cb.tar.bz2
ayatana-indicator-session-f2d458b0addfe408835366939b49f4a38c0a14cb.zip
get location overridden and debugs tidied up
Diffstat (limited to 'src')
-rw-r--r--src/indicator-session.c74
-rw-r--r--src/session-dbus.c9
-rw-r--r--src/session-service.c2
3 files changed, 66 insertions, 19 deletions
diff --git a/src/indicator-session.c b/src/indicator-session.c
index 704e959..5a5e26c 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -102,7 +102,9 @@ static void indicator_session_init (IndicatorSession *self);
static void indicator_session_dispose (GObject *object);
static void indicator_session_finalize (GObject *object);
static GList* indicator_session_get_entries (IndicatorObject* obj);
-
+static guint indicator_session_get_location (IndicatorObject * io,
+ IndicatorObjectEntry * entry);
+
G_DEFINE_TYPE (IndicatorSession, indicator_session, INDICATOR_OBJECT_TYPE);
static void
@@ -115,6 +117,7 @@ indicator_session_class_init (IndicatorSessionClass *klass)
IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
io_class->get_entries = indicator_session_get_entries;
+ io_class->get_location = indicator_session_get_location;
return;
}
@@ -246,6 +249,7 @@ indicator_session_get_entries (IndicatorObject* obj)
g_return_val_if_fail(IS_INDICATOR_SESSION(obj), NULL);
IndicatorSession* self = INDICATOR_SESSION (obj);
+ g_debug ("get entries");
GList * retval = NULL;
// Only show the users menu if we have more than one
if (self->show_users_entry == TRUE){
@@ -259,6 +263,21 @@ indicator_session_get_entries (IndicatorObject* obj)
return retval;
}
+static guint
+indicator_session_get_location (IndicatorObject * io,
+ IndicatorObjectEntry * entry)
+{
+ IndicatorSession * self = INDICATOR_SESSION (io);
+ if (entry == &self->users){
+ return 1;
+ }
+ else if (entry == &self->devices){
+ return 0;
+ }
+ g_warning ("IOEntry handed to us to position but we don't own it!");
+ return -1;
+}
+
/* callback for the service manager state of being */
static void
service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointer user_data)
@@ -421,15 +440,28 @@ user_menu_visibility_get_cb (GObject* obj, GAsyncResult* res, gpointer user_data
}
gboolean update;
g_variant_get (result, "(b)", &update);
- g_debug ("GET VISIBILITY CB: NEW VALUE = %i", update);
+
+ // If it is what we had before no need to do anything...
+ if (self->show_users_entry == update){
+ return;
+ }
+
+ //Otherwise
self->show_users_entry = update;
- g_signal_emit_by_name (user_data,
- "entry-added",
- self->parent,
- self->users);
- return;
-}
+ IndicatorObjectEntry user_entry = self->users;
+
+ if (self->show_users_entry == TRUE){
+ g_signal_emit_by_name ((gpointer)self,
+ "entry-added",
+ &user_entry);
+ }
+ else{
+ g_signal_emit_by_name ((gpointer)self,
+ "entry-removed",
+ &user_entry);
+ }
+}
/* Receives all signals from the service, routed to the appropriate functions */
static void
@@ -447,10 +479,30 @@ receive_signal (GDBusProxy * proxy,
indicator_session_update_users_label (self, username);
}
else if (g_strcmp0(signal_name, "UserMenuIsVisible") == 0) {
- gboolean result = g_variant_get_boolean (parameters);
- g_debug ("GET VISIBILITY signal: NEW VALUE = %i", result);
+ gboolean update;
+ g_variant_get (parameters, "(b)", &update);
+
+ // If it is what we had before no need to do anything...
+ if (self->show_users_entry == update){
+ return;
+ }
+
+ //Otherwise
+ self->show_users_entry = update;
+
+ IndicatorObjectEntry user_entry = self->users;
+
+ if (self->show_users_entry == TRUE){
+ g_signal_emit_by_name ((gpointer)self,
+ "entry-added",
+ &user_entry);
+ }
+ else{
+ g_signal_emit_by_name ((gpointer)self,
+ "entry-removed",
+ &user_entry);
+ }
}
- return;
}
diff --git a/src/session-dbus.c b/src/session-dbus.c
index 9e24141..9aa75ef 100644
--- a/src/session-dbus.c
+++ b/src/session-dbus.c
@@ -225,7 +225,6 @@ static GVariant *
get_users_real_name (SessionDbus * service)
{
SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(service);
- g_debug ("Get users real name: %s", priv->name);
return g_variant_new ("(s)", priv->name);
}
@@ -249,9 +248,7 @@ session_dbus_set_users_real_name (SessionDbus * session, const gchar * name)
g_free(priv->name);
priv->name = NULL;
}
-
- g_debug ("sesssion dbus set name with %s", name);
-
+
priv->name = g_strdup(name);
if (priv->bus != NULL) {
@@ -278,9 +275,7 @@ session_dbus_set_user_menu_visibility (SessionDbus* session,
{
SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(session);
GError * error = NULL;
-
- g_debug ("sesssion dbus set user visibility - %i", visible);
-
+
priv->user_menu_is_visible = visible;
if (priv->bus != NULL) {
diff --git a/src/session-service.c b/src/session-service.c
index 812769e..fb6ce37 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -490,7 +490,7 @@ rebuild_user_items (DbusmenuMenuitem *root,
GList * users = NULL;
users = users_service_dbus_get_user_list (service);
guint user_count = g_list_length(users);
- g_debug ("USER COUNT = %i", user_count);
+ // g_debug ("USER COUNT = %i", user_count);
// We only want to show this menu when we have more than one registered
// user
session_dbus_set_user_menu_visibility (session_dbus, user_count > 1);