diff options
author | Sebastien Bacher <seb128@ubuntu.com> | 2011-09-06 22:09:32 +0200 |
---|---|---|
committer | Sebastien Bacher <seb128@ubuntu.com> | 2011-09-06 22:09:32 +0200 |
commit | 4c5b007b92e1e1f91d2a15657bb1bed5feed8520 (patch) | |
tree | 87a5c4bf1ab184fd5ce2fdbf43e0a4e763afd69b /src/indicator-session.c | |
parent | 6d01875aaef54bca8ed9377557718c4510ca89cd (diff) | |
parent | f3e7aa155d66704fcdb97ec4201095dfe9e74a0a (diff) | |
download | ayatana-indicator-session-4c5b007b92e1e1f91d2a15657bb1bed5feed8520.tar.gz ayatana-indicator-session-4c5b007b92e1e1f91d2a15657bb1bed5feed8520.tar.bz2 ayatana-indicator-session-4c5b007b92e1e1f91d2a15657bb1bed5feed8520.zip |
* New upstream release.
- new gsettings key "com.canonical.indicator.session user-show-menu"
- "[UIFe]Greeter power menu has cog icon but no settings"
(lp: #838546)
Diffstat (limited to 'src/indicator-session.c')
-rw-r--r-- | src/indicator-session.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/indicator-session.c b/src/indicator-session.c index aacef49..2f1764f 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -70,6 +70,8 @@ struct _IndicatorSession { GDBusProxy * service_proxy; }; +static gboolean greeter_mode; + GType indicator_session_get_type (void); /* Indicator stuff */ @@ -164,10 +166,18 @@ indicator_session_init (IndicatorSession *self) self->users.label = GTK_LABEL (gtk_label_new (NULL)); + const gchar *greeter_var; + greeter_var = g_getenv("INDICATOR_GREETER_MODE"); + greeter_mode = g_strcmp0(greeter_var, "1") == 0; // devices self->devices.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT)); - self->devices.image = indicator_image_helper (ICON_DEFAULT); + if (greeter_mode){ + self->devices.image = indicator_image_helper (GREETER_ICON_DEFAULT); + } + else{ + self->devices.image = indicator_image_helper (ICON_DEFAULT); + } gtk_widget_show (GTK_WIDGET(self->devices.menu)); gtk_widget_show (GTK_WIDGET(self->devices.image)); @@ -498,7 +508,12 @@ receive_signal (GDBusProxy * proxy, } } else if (g_strcmp0(signal_name, "RestartRequired") == 0) { - self->devices.image = indicator_image_helper (ICON_RESTART); + if (greeter_mode == TRUE){ + self->devices.image = indicator_image_helper (GREETER_ICON_RESTART); + } + else{ + self->devices.image = indicator_image_helper (ICON_RESTART); + } } } |