diff options
| author | Michael Terry <michael.terry@canonical.com> | 2012-10-22 15:07:14 -0400 |
|---|---|---|
| committer | Michael Terry <michael.terry@canonical.com> | 2012-10-22 15:07:14 -0400 |
| commit | 1d99dbe6b12edfa34008785968a041957c4eaee5 (patch) | |
| tree | f8e8f88f32f86c58e86fac5cd1ec37937b540cf4 /src | |
| parent | 57b62d5fa18525811e1a4b413b1c6b966b5f28f8 (diff) | |
| download | ayatana-indicator-session-1d99dbe6b12edfa34008785968a041957c4eaee5.tar.gz ayatana-indicator-session-1d99dbe6b12edfa34008785968a041957c4eaee5.tar.bz2 ayatana-indicator-session-1d99dbe6b12edfa34008785968a041957c4eaee5.zip | |
use the same icons in the greeter as we do in a user session
Diffstat (limited to 'src')
| -rw-r--r-- | src/indicator-session.c | 24 | ||||
| -rw-r--r-- | src/shared-names.h | 3 |
2 files changed, 5 insertions, 22 deletions
diff --git a/src/indicator-session.c b/src/indicator-session.c index c0db8d8..431292e 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -67,8 +67,6 @@ struct _IndicatorSession GtkIconTheme * icon_theme; }; -static gboolean greeter_mode; - GType indicator_session_get_type (void); /* Indicator stuff */ @@ -126,8 +124,6 @@ indicator_session_init (IndicatorSession *self) INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(service_connection_cb), self); - greeter_mode = !g_strcmp0(g_getenv("INDICATOR_GREETER_MODE"), "1"); - self->entry.name_hint = PACKAGE; self->entry.label = GTK_LABEL (gtk_label_new ("User Name")); self->entry.image = GTK_IMAGE (gtk_image_new()); @@ -405,22 +401,12 @@ indicator_session_update_icon_from_disposition (IndicatorSession * indicator, { const gchar * icon; - if (greeter_mode) - { - if (disposition == DISPOSITION_NORMAL) - icon = GREETER_ICON_DEFAULT; - else - icon = GREETER_ICON_RESTART; - } + if (disposition == DISPOSITION_NORMAL) + icon = ICON_DEFAULT; + else if (disposition == DISPOSITION_INFO) + icon = ICON_INFO; else - { - if (disposition == DISPOSITION_NORMAL) - icon = ICON_DEFAULT; - else if (disposition == DISPOSITION_INFO) - icon = ICON_INFO; - else - icon = ICON_ALERT; - } + icon = ICON_ALERT; if (gtk_icon_theme_has_icon (indicator->icon_theme, icon) == FALSE) icon = "gtk-missing-image"; diff --git a/src/shared-names.h b/src/shared-names.h index 900fbbe..c08f98a 100644 --- a/src/shared-names.h +++ b/src/shared-names.h @@ -40,9 +40,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define ICON_INFO "system-devices-panel-information" #define ICON_ALERT "system-devices-panel-alert" -#define GREETER_ICON_DEFAULT "system-shutdown-panel" -#define GREETER_ICON_RESTART "system-shutdown-panel-restart" - /* the session indicator's settings */ #define SESSION_SCHEMA "com.canonical.indicator.session" #define SUPPRESS_KEY "suppress-logout-restart-shutdown" |