1 files changed, 8 insertions, 19 deletions

diff --git a/src/indicator-session.c b/src/indicator-session.c
index c100d78..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());
@@ -379,8 +375,11 @@ indicator_session_update_a11y_from_disposition (IndicatorSession * indicator,
                                                      "show-real-name-on-panel");
 
   if (show_name && need_attn)
+    /* Translators: the name of the menu ("System"), followed by the user's name,
+       followed by a hint that an item in this menu requires an action from the user */
     a11y = g_strdup_printf (_("System %s (Attention Required)"), username);
   else if (show_name)
+    /* Translators: the name of the menu ("System"), followed by the user's name */
     a11y = g_strdup_printf (_("System %s"), username);
   else if (need_attn)
     a11y = g_strdup  (_("System (Attention Required)"));
@@ -402,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";