From cf87a398189c2f64a5b60e910da382a613fed9f0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 18 Sep 2012 11:09:15 -0500 Subject: Still using 'switch off' instead of 'shut down' in the default text in session-menu-mgr.c --- src/session-menu-mgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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); -- cgit v1.2.3 From e2f76a71222f95d422de46dfce8aa61c7a9e9943 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 18 Sep 2012 11:10:10 -0500 Subject: add AM_V_GEN to the gdbus-codegen invocation for prettier silent-rules invocation --- src/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 \ -- cgit v1.2.3