Merge lp:~charlesk/indicator-session/lp-1029036 into lp:indicator-session/12.10

Proposed by Charles Kerr on 2012-09-18
Status: Merged
Approved by: Ted Gould on 2012-09-18
Approved revision: 360
Merged at revision: 359
Proposed branch: lp:~charlesk/indicator-session/lp-1029036
Merge into: lp:indicator-session/12.10
Diff against target: 90 lines (+10/-10)
2 files modified
src/Makefile.am (+7/-7)
src/session-menu-mgr.c (+3/-3)
To merge this branch: bzr merge lp:~charlesk/indicator-session/lp-1029036
Reviewer Review Type Date Requested Status
Ted Gould (community) 2012-09-18 Approve on 2012-09-18
jenkins (community) continuous-integration Approve on 2012-09-18
Review via email: mp+124972@code.launchpad.net

Commit message

Use `shut down' instead of `switch off' as the default shutdown text (fixes bug #1029036)

To post a comment you must log in.
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Makefile.am'
2--- src/Makefile.am 2012-08-21 07:38:09 +0000
3+++ src/Makefile.am 2012-09-18 16:17:25 +0000
4@@ -38,7 +38,7 @@
5 dbus-display-manager.h
6
7 $(dbus_display_manager_sources): display-manager.xml
8- gdbus-codegen \
9+ $(AM_V_GEN) gdbus-codegen \
10 --interface-prefix org.freedesktop \
11 --generate-c-code dbus-display-manager \
12 $^
13@@ -48,7 +48,7 @@
14 dbus-consolekit-manager.h
15
16 $(dbus_consolekit_manager_sources): org.freedesktop.ConsoleKit.Manager.xml
17- gdbus-codegen \
18+ $(AM_V_GEN) gdbus-codegen \
19 --interface-prefix org.freedesktop \
20 --generate-c-code dbus-consolekit-manager \
21 $^
22@@ -58,7 +58,7 @@
23 dbus-consolekit-seat.h
24
25 $(dbus_consolekit_seat_sources): org.freedesktop.ConsoleKit.Seat.xml
26- gdbus-codegen \
27+ $(AM_V_GEN) gdbus-codegen \
28 --interface-prefix org.freedesktop \
29 --generate-c-code dbus-consolekit-seat \
30 $^
31@@ -68,7 +68,7 @@
32 dbus-consolekit-session.h
33
34 $(dbus_consolekit_session_sources): org.freedesktop.ConsoleKit.Session.xml
35- gdbus-codegen \
36+ $(AM_V_GEN) gdbus-codegen \
37 --interface-prefix org.freedesktop \
38 --generate-c-code dbus-consolekit-session \
39 $^
40@@ -78,7 +78,7 @@
41 dbus-accounts.h
42
43 $(dbus_accounts_sources): org.freedesktop.Accounts.xml
44- gdbus-codegen \
45+ $(AM_V_GEN) gdbus-codegen \
46 --interface-prefix org.freedesktop \
47 --generate-c-code dbus-accounts \
48 $^
49@@ -88,7 +88,7 @@
50 dbus-user.h
51
52 $(dbus_user_sources): org.freedesktop.Accounts.User.xml
53- gdbus-codegen \
54+ $(AM_V_GEN) gdbus-codegen \
55 --interface-prefix org.freedesktop \
56 --generate-c-code dbus-user \
57 $^
58@@ -98,7 +98,7 @@
59 dbus-upower.h
60
61 $(dbus_upower_sources): upower.xml
62- gdbus-codegen \
63+ $(AM_V_GEN) gdbus-codegen \
64 --interface-prefix org.freedesktop \
65 --generate-c-code dbus-upower \
66 --c-namespace DBus \
67
68=== modified file 'src/session-menu-mgr.c'
69--- src/session-menu-mgr.c 2012-09-13 10:45:34 +0000
70+++ src/session-menu-mgr.c 2012-09-18 16:17:25 +0000
71@@ -488,8 +488,8 @@
72 mi_set_label (mgr->logout_mi, confirm_needed ? _("Log Out\342\200\246")
73 : _("Log Out"));
74
75- mi_set_label (mgr->shutdown_mi, confirm_needed ? _("Switch Off\342\200\246")
76- : _("Switch Off"));
77+ mi_set_label (mgr->shutdown_mi, confirm_needed ? _("Shut Down\342\200\246")
78+ : _("Shut Down"));
79
80 dbusmenu_menuitem_property_set (mgr->restart_mi, RESTART_ITEM_LABEL,
81 confirm_needed ? _("Restart\342\200\246")
82@@ -523,7 +523,7 @@
83 g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
84 G_CALLBACK(action_func_spawn_async), CMD_RESTART);
85
86- mi = mgr->shutdown_mi = mi_new (_("Switch Off\342\200\246"));
87+ mi = mgr->shutdown_mi = mi_new (_("Shut Down\342\200\246"));
88 dbusmenu_menuitem_child_append (mgr->top_mi, mi);
89 g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
90 G_CALLBACK(action_func_spawn_async), CMD_SHUTDOWN);

Subscribers

People subscribed via source and target branches