Session Menu

Merge lp:~cjcurran/indicator-session/greeter-icon into lp:indicator-session/0.1

  1. greeter-icon
  2. Merge into trunk
Proposed by Conor Curran
Status: Merged
Approved by: Conor Curran
Approved revision: 200
Merged at revision: 203
Proposed branch: lp:~cjcurran/indicator-session/greeter-icon
Merge into: lp:indicator-session/0.1
Diff against target: 35 lines (+11/-1)
2 files modified
src/dbus-shared-names.h (+1/-0)
src/indicator-session.c (+10/-1)
To merge this branch: bzr merge lp:~cjcurran/indicator-session/greeter-icon
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+73705@code.launchpad.net

Description of the change

Merge the greeter icon switch branch

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve
lp:~cjcurran/indicator-session/greeter-icon updated
200. By Conor Curran

make sure to flag restart state in greeter mode also with the right icon

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dbus-shared-names.h'
2--- src/dbus-shared-names.h 2011-08-22 14:53:07 +0000
3+++ src/dbus-shared-names.h 2011-09-01 17:25:05 +0000
4@@ -63,5 +63,6 @@
5
6 #define ICON_DEFAULT "system-devices-panel"
7 #define ICON_RESTART "system-devices-panel-alert"
8+#define GREETER_ICON_DEFAULT "system-shutdown-panel"
9
10 #endif /* __DBUS_SHARED_NAMES_H__ */
11
12=== modified file 'src/indicator-session.c'
13--- src/indicator-session.c 2011-08-31 13:32:07 +0000
14+++ src/indicator-session.c 2011-09-01 17:25:05 +0000
15@@ -164,10 +164,19 @@
16
17 self->users.label = GTK_LABEL (gtk_label_new (NULL));
18
19+ const gchar *greeter_var;
20+ greeter_var = g_getenv("INDICATOR_GREETER_MODE");
21+
22 // devices
23 self->devices.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME,
24 INDICATOR_SESSION_DBUS_OBJECT));
25- self->devices.image = indicator_image_helper (ICON_DEFAULT);
26+ if (g_strcmp0(greeter_var, "1") == 0){
27+ self->devices.image = indicator_image_helper (GREETER_ICON_DEFAULT);
28+ }
29+ else{
30+ self->devices.image = indicator_image_helper (ICON_DEFAULT);
31+ }
32+
33
34 gtk_widget_show (GTK_WIDGET(self->devices.menu));
35 gtk_widget_show (GTK_WIDGET(self->devices.image));

Subscribers

People subscribed via source and target branches