From 383e28467156675a5c1231c37eafb2a7bbc6e4f2 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Thu, 1 Sep 2011 18:23:35 +0100
Subject: much easier of handling the greeter icon

---
 src/dbus-shared-names.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/dbus-shared-names.h')

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__ */
-- 
cgit v1.2.3


From a335b8e973287fa5cf60286bb6fd8f46fb66ad83 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Fri, 2 Sep 2011 12:11:13 +0100
Subject: make sure to flag restart state in greeter mode also with the right
 icon

---
 src/dbus-shared-names.h |  2 ++
 src/indicator-session.c | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/dbus-shared-names.h')

diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h
index 350fa6d..11aebca 100644
--- a/src/dbus-shared-names.h
+++ b/src/dbus-shared-names.h
@@ -64,5 +64,7 @@ typedef enum {
 #define ICON_DEFAULT              "system-devices-panel"
 #define ICON_RESTART              "system-devices-panel-alert"
 #define GREETER_ICON_DEFAULT      "system-shutdown-panel"
+#define GREETER_ICON_RESTART      "system-shutdown-panel-restart"
+
 
 #endif /* __DBUS_SHARED_NAMES_H__ */
diff --git a/src/indicator-session.c b/src/indicator-session.c
index 2b36fdd..7a8a238 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 */
@@ -166,11 +168,11 @@ indicator_session_init (IndicatorSession *self)
 
   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));
-  if (g_strcmp0(greeter_var, "1") == 0){
+  if (greeter_mode){
     self->devices.image = indicator_image_helper (GREETER_ICON_DEFAULT);
   }
   else{
@@ -507,7 +509,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);      
+    }
   }  
 }
 
-- 
cgit v1.2.3


From 3f39e981fdbe934faf762de161645edd5eba753f Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Fri, 2 Sep 2011 16:16:09 +0100
Subject: remove the greeter icon stuff

---
 src/dbus-shared-names.h |  1 -
 src/indicator-session.c | 11 +----------
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'src/dbus-shared-names.h')

diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h
index 350fa6d..c5372e4 100644
--- a/src/dbus-shared-names.h
+++ b/src/dbus-shared-names.h
@@ -63,6 +63,5 @@ 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 2b36fdd..aacef49 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -164,19 +164,10 @@ 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));
-  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);
-  }
-
+  self->devices.image = indicator_image_helper (ICON_DEFAULT);
   
   gtk_widget_show (GTK_WIDGET(self->devices.menu));
   gtk_widget_show (GTK_WIDGET(self->devices.image));
-- 
cgit v1.2.3