From 1d99dbe6b12edfa34008785968a041957c4eaee5 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Mon, 22 Oct 2012 15:07:14 -0400 Subject: use the same icons in the greeter as we do in a user session --- data/icons/16x16/actions/Makefile.am | 1 - data/icons/16x16/actions/system-shutdown-panel.png | Bin 699 -> 0 bytes data/icons/22x22/actions/Makefile.am | 1 - data/icons/22x22/actions/system-shutdown-panel.png | Bin 1339 -> 0 bytes data/icons/24x24/actions/Makefile.am | 1 - data/icons/24x24/actions/system-shutdown-panel.png | Bin 1355 -> 0 bytes data/icons/scalable/actions/Makefile.am | 1 - .../scalable/actions/system-shutdown-panel.svg | 247 --------------------- src/indicator-session.c | 24 +- src/shared-names.h | 3 - 10 files changed, 5 insertions(+), 273 deletions(-) delete mode 100644 data/icons/16x16/actions/system-shutdown-panel.png delete mode 100644 data/icons/22x22/actions/system-shutdown-panel.png delete mode 100644 data/icons/24x24/actions/system-shutdown-panel.png delete mode 100644 data/icons/scalable/actions/system-shutdown-panel.svg diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am index 417ab60..5aa276c 100644 --- a/data/icons/16x16/actions/Makefile.am +++ b/data/icons/16x16/actions/Makefile.am @@ -2,7 +2,6 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/actions icons_DATA = \ - system-shutdown-panel.png \ system-shutdown.png \ system-restart.png \ system-log-out.png diff --git a/data/icons/16x16/actions/system-shutdown-panel.png b/data/icons/16x16/actions/system-shutdown-panel.png deleted file mode 100644 index ef69a83..0000000 Binary files a/data/icons/16x16/actions/system-shutdown-panel.png and /dev/null differ diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am index 029ad1c..73cdd09 100644 --- a/data/icons/22x22/actions/Makefile.am +++ b/data/icons/22x22/actions/Makefile.am @@ -2,7 +2,6 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/actions icons_DATA = \ - system-shutdown-panel.png \ system-shutdown.png \ system-restart.png \ system-log-out.png diff --git a/data/icons/22x22/actions/system-shutdown-panel.png b/data/icons/22x22/actions/system-shutdown-panel.png deleted file mode 100644 index aef0e91..0000000 Binary files a/data/icons/22x22/actions/system-shutdown-panel.png and /dev/null differ diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am index aebdf14..55c63d1 100644 --- a/data/icons/24x24/actions/Makefile.am +++ b/data/icons/24x24/actions/Makefile.am @@ -2,7 +2,6 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/actions icons_DATA = \ - system-shutdown-panel.png \ system-shutdown.png \ system-restart.png \ system-log-out.png diff --git a/data/icons/24x24/actions/system-shutdown-panel.png b/data/icons/24x24/actions/system-shutdown-panel.png deleted file mode 100644 index c1cca10..0000000 Binary files a/data/icons/24x24/actions/system-shutdown-panel.png and /dev/null differ diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am index 26ee574..39b4177 100644 --- a/data/icons/scalable/actions/Makefile.am +++ b/data/icons/scalable/actions/Makefile.am @@ -2,7 +2,6 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/actions icons_DATA = \ - system-shutdown-panel.svg \ system-restart.svg \ system-log-out.svg \ system-shutdown.svg diff --git a/data/icons/scalable/actions/system-shutdown-panel.svg b/data/icons/scalable/actions/system-shutdown-panel.svg deleted file mode 100644 index fc60baf..0000000 --- a/data/icons/scalable/actions/system-shutdown-panel.svg +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Shutdown - - - Jakub Steiner - - - - http://jimmac.musichall.cz - - - lock - key - secure - - - - - - - - - - - - - - - - - - - - - - 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 . #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" -- cgit v1.2.3