Session Menu

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

  1. lp-1029036
  2. Merge into trunk.12.10
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
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) Approve
jenkins (community) continuous-integration Approve
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.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:360
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/14/console

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2012-08-21 07:38:09 +0000
+++ src/Makefile.am 2012-09-18 16:17:25 +0000
@@ -38,7 +38,7 @@
38 dbus-display-manager.h38 dbus-display-manager.h
3939
40$(dbus_display_manager_sources): display-manager.xml40$(dbus_display_manager_sources): display-manager.xml
41 gdbus-codegen \41 $(AM_V_GEN) gdbus-codegen \
42 --interface-prefix org.freedesktop \42 --interface-prefix org.freedesktop \
43 --generate-c-code dbus-display-manager \43 --generate-c-code dbus-display-manager \
44 $^44 $^
@@ -48,7 +48,7 @@
48 dbus-consolekit-manager.h48 dbus-consolekit-manager.h
4949
50$(dbus_consolekit_manager_sources): org.freedesktop.ConsoleKit.Manager.xml50$(dbus_consolekit_manager_sources): org.freedesktop.ConsoleKit.Manager.xml
51 gdbus-codegen \51 $(AM_V_GEN) gdbus-codegen \
52 --interface-prefix org.freedesktop \52 --interface-prefix org.freedesktop \
53 --generate-c-code dbus-consolekit-manager \53 --generate-c-code dbus-consolekit-manager \
54 $^54 $^
@@ -58,7 +58,7 @@
58 dbus-consolekit-seat.h58 dbus-consolekit-seat.h
5959
60$(dbus_consolekit_seat_sources): org.freedesktop.ConsoleKit.Seat.xml60$(dbus_consolekit_seat_sources): org.freedesktop.ConsoleKit.Seat.xml
61 gdbus-codegen \61 $(AM_V_GEN) gdbus-codegen \
62 --interface-prefix org.freedesktop \62 --interface-prefix org.freedesktop \
63 --generate-c-code dbus-consolekit-seat \63 --generate-c-code dbus-consolekit-seat \
64 $^64 $^
@@ -68,7 +68,7 @@
68 dbus-consolekit-session.h68 dbus-consolekit-session.h
6969
70$(dbus_consolekit_session_sources): org.freedesktop.ConsoleKit.Session.xml70$(dbus_consolekit_session_sources): org.freedesktop.ConsoleKit.Session.xml
71 gdbus-codegen \71 $(AM_V_GEN) gdbus-codegen \
72 --interface-prefix org.freedesktop \72 --interface-prefix org.freedesktop \
73 --generate-c-code dbus-consolekit-session \73 --generate-c-code dbus-consolekit-session \
74 $^74 $^
@@ -78,7 +78,7 @@
78 dbus-accounts.h78 dbus-accounts.h
7979
80$(dbus_accounts_sources): org.freedesktop.Accounts.xml80$(dbus_accounts_sources): org.freedesktop.Accounts.xml
81 gdbus-codegen \81 $(AM_V_GEN) gdbus-codegen \
82 --interface-prefix org.freedesktop \82 --interface-prefix org.freedesktop \
83 --generate-c-code dbus-accounts \83 --generate-c-code dbus-accounts \
84 $^84 $^
@@ -88,7 +88,7 @@
88 dbus-user.h88 dbus-user.h
8989
90$(dbus_user_sources): org.freedesktop.Accounts.User.xml90$(dbus_user_sources): org.freedesktop.Accounts.User.xml
91 gdbus-codegen \91 $(AM_V_GEN) gdbus-codegen \
92 --interface-prefix org.freedesktop \92 --interface-prefix org.freedesktop \
93 --generate-c-code dbus-user \93 --generate-c-code dbus-user \
94 $^94 $^
@@ -98,7 +98,7 @@
98 dbus-upower.h98 dbus-upower.h
9999
100$(dbus_upower_sources): upower.xml100$(dbus_upower_sources): upower.xml
101 gdbus-codegen \101 $(AM_V_GEN) gdbus-codegen \
102 --interface-prefix org.freedesktop \102 --interface-prefix org.freedesktop \
103 --generate-c-code dbus-upower \103 --generate-c-code dbus-upower \
104 --c-namespace DBus \104 --c-namespace DBus \
105105
=== modified file 'src/session-menu-mgr.c'
--- src/session-menu-mgr.c 2012-09-13 10:45:34 +0000
+++ src/session-menu-mgr.c 2012-09-18 16:17:25 +0000
@@ -488,8 +488,8 @@
488 mi_set_label (mgr->logout_mi, confirm_needed ? _("Log Out\342\200\246")488 mi_set_label (mgr->logout_mi, confirm_needed ? _("Log Out\342\200\246")
489 : _("Log Out"));489 : _("Log Out"));
490490
491 mi_set_label (mgr->shutdown_mi, confirm_needed ? _("Switch Off\342\200\246")491 mi_set_label (mgr->shutdown_mi, confirm_needed ? _("Shut Down\342\200\246")
492 : _("Switch Off"));492 : _("Shut Down"));
493493
494 dbusmenu_menuitem_property_set (mgr->restart_mi, RESTART_ITEM_LABEL,494 dbusmenu_menuitem_property_set (mgr->restart_mi, RESTART_ITEM_LABEL,
495 confirm_needed ? _("Restart\342\200\246")495 confirm_needed ? _("Restart\342\200\246")
@@ -523,7 +523,7 @@
523 g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,523 g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
524 G_CALLBACK(action_func_spawn_async), CMD_RESTART);524 G_CALLBACK(action_func_spawn_async), CMD_RESTART);
525525
526 mi = mgr->shutdown_mi = mi_new (_("Switch Off\342\200\246"));526 mi = mgr->shutdown_mi = mi_new (_("Shut Down\342\200\246"));
527 dbusmenu_menuitem_child_append (mgr->top_mi, mi);527 dbusmenu_menuitem_child_append (mgr->top_mi, mi);
528 g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,528 g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
529 G_CALLBACK(action_func_spawn_async), CMD_SHUTDOWN);529 G_CALLBACK(action_func_spawn_async), CMD_SHUTDOWN);

Subscribers

People subscribed via source and target branches