diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-09-18 19:29:10 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2012-09-18 19:29:10 +0000 |
| commit | 33297fba56a32c7c5a4ff848a9814721dd293049 (patch) | |
| tree | 06f61ab314522e2714d43b59faadd6c784263dd1 | |
| parent | 2496d6700ceb0dc5397ec802853846e95c44373d (diff) | |
| parent | e2f76a71222f95d422de46dfce8aa61c7a9e9943 (diff) | |
| download | ayatana-indicator-session-33297fba56a32c7c5a4ff848a9814721dd293049.tar.gz ayatana-indicator-session-33297fba56a32c7c5a4ff848a9814721dd293049.tar.bz2 ayatana-indicator-session-33297fba56a32c7c5a4ff848a9814721dd293049.zip | |
Use `shut down' instead of `switch off' as the default shutdown text (fixes bug #1029036). Fixes: https://bugs.launchpad.net/bugs/1029036. Approved by Ted Gould, jenkins.
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rw-r--r-- | src/session-menu-mgr.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index cd82812..bcc8652 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,7 +38,7 @@ dbus_display_manager_sources = \ dbus-display-manager.h $(dbus_display_manager_sources): display-manager.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-display-manager \ $^ @@ -48,7 +48,7 @@ dbus_consolekit_manager_sources = \ dbus-consolekit-manager.h $(dbus_consolekit_manager_sources): org.freedesktop.ConsoleKit.Manager.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-consolekit-manager \ $^ @@ -58,7 +58,7 @@ dbus_consolekit_seat_sources = \ dbus-consolekit-seat.h $(dbus_consolekit_seat_sources): org.freedesktop.ConsoleKit.Seat.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-consolekit-seat \ $^ @@ -68,7 +68,7 @@ dbus_consolekit_session_sources = \ dbus-consolekit-session.h $(dbus_consolekit_session_sources): org.freedesktop.ConsoleKit.Session.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-consolekit-session \ $^ @@ -78,7 +78,7 @@ dbus_accounts_sources = \ dbus-accounts.h $(dbus_accounts_sources): org.freedesktop.Accounts.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-accounts \ $^ @@ -88,7 +88,7 @@ dbus_user_sources = \ dbus-user.h $(dbus_user_sources): org.freedesktop.Accounts.User.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-user \ $^ @@ -98,7 +98,7 @@ dbus_upower_sources = \ dbus-upower.h $(dbus_upower_sources): upower.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-upower \ --c-namespace DBus \ diff --git a/src/session-menu-mgr.c b/src/session-menu-mgr.c index cfb907b..f6cd038 100644 --- a/src/session-menu-mgr.c +++ b/src/session-menu-mgr.c @@ -488,8 +488,8 @@ update_confirmation_labels (SessionMenuMgr * mgr) mi_set_label (mgr->logout_mi, confirm_needed ? _("Log Out\342\200\246") : _("Log Out")); - mi_set_label (mgr->shutdown_mi, confirm_needed ? _("Switch Off\342\200\246") - : _("Switch Off")); + mi_set_label (mgr->shutdown_mi, confirm_needed ? _("Shut Down\342\200\246") + : _("Shut Down")); dbusmenu_menuitem_property_set (mgr->restart_mi, RESTART_ITEM_LABEL, confirm_needed ? _("Restart\342\200\246") @@ -523,7 +523,7 @@ build_session_menuitems (SessionMenuMgr* mgr) g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(action_func_spawn_async), CMD_RESTART); - mi = mgr->shutdown_mi = mi_new (_("Switch Off\342\200\246")); + mi = mgr->shutdown_mi = mi_new (_("Shut Down\342\200\246")); dbusmenu_menuitem_child_append (mgr->top_mi, mi); g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(action_func_spawn_async), CMD_SHUTDOWN); |