ayatana-commits team mailing list archive

[Conor Curran <conor.curran@xxxxxxxxxxxxx>]

Conor Curran has proposed merging lp:~cjcurran/indicator-session/greeter-icon into lp:indicator-session.

Requested reviews:
  Ted Gould (ted)

For more details, see:
https://code.launchpad.net/~cjcurran/indicator-session/greeter-icon/+merge/73705

Merge the greeter icon switch branch
-- 
https://code.launchpad.net/~cjcurran/indicator-session/greeter-icon/+merge/73705
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/dbus-shared-names.h'
--- src/dbus-shared-names.h	2011-08-22 14:53:07 +0000
+++ src/dbus-shared-names.h	2011-09-01 17:25:05 +0000
@@ -63,5 +63,6 @@
 
 #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__ */

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2011-08-31 13:32:07 +0000
+++ src/indicator-session.c	2011-09-01 17:25:05 +0000
@@ -164,10 +164,19 @@
                                                       
   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));