diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-09-01 18:30:56 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-09-01 18:30:56 +0100 |
| commit | ea01f7722081d1d29b6d80b708a22a60c3938bf9 (patch) | |
| tree | 2600fd61fe62fa38133af27fc41c060bc051ba2e | |
| parent | 07a72b950fb099df379d241ad129d938c5d22990 (diff) | |
| parent | 383e28467156675a5c1231c37eafb2a7bbc6e4f2 (diff) | |
| download | ayatana-indicator-session-0.3.4.1.tar.gz ayatana-indicator-session-0.3.4.1.tar.bz2 ayatana-indicator-session-0.3.4.1.zip | |
ready for 0.3.4.10.3.4.1
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/dbus-shared-names.h | 1 | ||||
| -rw-r--r-- | src/indicator-session.c | 11 |
3 files changed, 12 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a2f96f5..49353b2 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.3.4) +AM_INIT_AUTOMAKE(indicator-session, 0.3.4.1) AM_MAINTAINER_MODE diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index c5372e4..350fa6d 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -63,5 +63,6 @@ typedef enum { #define ICON_DEFAULT "system-devices-panel" #define ICON_RESTART "system-devices-panel-alert" +#define GREETER_ICON_DEFAULT "system-shutdown-panel" #endif /* __DBUS_SHARED_NAMES_H__ */ diff --git a/src/indicator-session.c b/src/indicator-session.c index aacef49..2b36fdd 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -164,10 +164,19 @@ 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"); + // 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 (g_strcmp0(greeter_var, "1") == 0){ + 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)); |