From 0d351a02b4920370b543a506dfd38f0af7db5631 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 19 Sep 2012 15:24:42 -0400 Subject: Import upstream version 12.10.3 --- AUTHORS | 4 +++ ChangeLog | 59 +++++++++++++++++++++++++++++++++++++++++++ NEWS | 6 +++++ configure | 2 +- configure.ac | 2 +- po/en_AU.po | 12 ++++----- po/en_CA.po | 12 ++++----- po/en_GB.po | 14 +++++----- src/Makefile.am | 14 +++++----- src/Makefile.in | 14 +++++----- src/dbus-accounts.c | 2 +- src/dbus-accounts.h | 2 +- src/dbus-consolekit-manager.c | 2 +- src/dbus-consolekit-manager.h | 2 +- src/dbus-consolekit-seat.c | 2 +- src/dbus-consolekit-seat.h | 2 +- src/dbus-consolekit-session.c | 2 +- src/dbus-consolekit-session.h | 2 +- src/dbus-display-manager.c | 2 +- src/dbus-display-manager.h | 2 +- src/dbus-upower.c | 2 +- src/dbus-upower.h | 2 +- src/dbus-user.c | 2 +- src/dbus-user.h | 2 +- src/dialog.c | 6 ++--- src/indicator-session.c | 20 +++++++++++++-- src/session-menu-mgr.c | 8 +++--- 27 files changed, 143 insertions(+), 58 deletions(-) diff --git a/AUTHORS b/AUTHORS index 24010d6..243030e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,6 +9,7 @@ Conor Curran Daniel van Vugt David Barth + Didier Roche Dmitry Shachnev Evgeni Golov Gabor Kelemen @@ -16,6 +17,7 @@ Jeremy Bicha Ken VanDine Kyle Nitzsche + Lars Uebernickel Luke Yelavich Marc Deslauriers Marco Trevisan (Treviño) @@ -26,6 +28,8 @@ Neil Jagdish Patel Robert Ancell Sebastien Bacher + Steve Langasek Tarmac Ted Gould vish + Xiao-Long Chen diff --git a/ChangeLog b/ChangeLog index 864babb..59cdff4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,64 @@ # Generated by Makefile. Do not edit. +2012-09-19 Charles Kerr + + 12.10.3 + +2012-09-19 Charles Kerr + + Don't unconditionally show the user menuitems -- let dbusmenu's code process the menuitem's VISIBLE property. Fixes: https://bugs.launchpad.net/bugs/1049902. Approved by Lars Uebernickel, jenkins. + +2012-09-18 Charles Kerr + + don't unconditionally show the user menuitems ... let dbusmenu's code process the menuitem's VISIBLE property + +2012-09-18 Charles Kerr + + 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. + +2012-09-18 Charles Kerr + + add AM_V_GEN to the gdbus-codegen invocation for prettier silent-rules invocation + +2012-09-18 Charles Kerr + + Still using 'switch off' instead of 'shut down' in the default text in session-menu-mgr.c + +2012-09-13 Lars Uebernickel + + If the system menu's icon is missing in the current theme, fall back to gtk-missing-icon instead of showing no icon at all.. Fixes: https://bugs.launchpad.net/bugs/1048348. Approved by Charles Kerr, jenkins. + +2012-09-13 Lars Uebernickel + + Change fallback icon to "gtk-missing-image" + +2012-09-13 Xiao-Long Chen + + Add fallback to "system-shutdown" icon + + Thanks Xiao-Long! + +2012-09-13 Lars Uebernickel + + Make suspend translatable + +2012-09-13 Didier Roche + + make Suspend translatable + +2012-09-12 Steve Langasek + + Fix strings to ensure en_US are used in proper locations. Fixes: https://bugs.launchpad.net/bugs/1029036. Approved by Ted Gould. + +2012-09-12 Steve Langasek + + Fix up the commonwealth translations for 'Shut Down' to reflect the consensus. + +2012-09-12 Steve Langasek + + Revert en_GB localization to 'Switch Off'; this needs to be done in the + translation, with the UI kept in en_US. + 2012-08-31 Charles Kerr add gtest-dbus-helper.h to test_service_SOURCES s.t. it gets bundled in the tarball diff --git a/NEWS b/NEWS index 5ac155d..6e34589 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +12.10.3 + - By default, use 'Shut Down' instead of 'Switch Off' (lp: #1029036) + - 12.10.0 showed "Guest user" even when disabled in lightdm (lp: #1049902) + - Provide a fallback if theme's missing the session menu icon (lp: #1029036) + - Fix some strings that hadn't been marked for translation + 12.10.2 - Add an 'Online Accounts' menuitem (lp: #1044464) - Add disposition highlighting to the indicator icon (lp: #1044015) diff --git a/configure b/configure index 2117db9..d0b6a64 100755 --- a/configure +++ b/configure @@ -3109,7 +3109,7 @@ fi # Define the identity of the package. PACKAGE=indicator-session - VERSION=12.10.2 + VERSION=12.10.3 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 6e647ca..c948b17 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 12.10.2) +AM_INIT_AUTOMAKE(indicator-session, 12.10.3) AM_MAINTAINER_MODE diff --git a/po/en_AU.po b/po/en_AU.po index c9ed739..22e749b 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -72,7 +72,7 @@ msgstr "Lock Screen" #: ../data/indicator-session-shutdown.desktop.in.in.h:1 #: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716 msgid "Shut Down" -msgstr "Shut Down" +msgstr "Switch Off" #: ../data/indicator-session-logout.desktop.in.in.h:1 #: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672 @@ -94,7 +94,7 @@ msgstr "Restart…" #: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721 msgid "Shut Down…" -msgstr "Shut Down…" +msgstr "Switch Off…" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:35 @@ -112,7 +112,7 @@ msgstr "Restart" #: ../src/dialog.c:37 msgctxt "title" msgid "Shut Down" -msgstr "Shut Down" +msgstr "Switch Off" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:41 @@ -132,7 +132,7 @@ msgstr "" msgid "" "Are you sure you want to close all programs and shut down the computer?" msgstr "" -"Are you sure you want to close all programs and shut down the computer?" +"Are you sure you want to close all programs and switch off the computer?" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:47 @@ -150,7 +150,7 @@ msgstr "Restart" #: ../src/dialog.c:49 msgctxt "button" msgid "Shut Down" -msgstr "Shut Down" +msgstr "Switch Off" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:55 @@ -168,7 +168,7 @@ msgstr "Restart…" #: ../src/dialog.c:57 msgctxt "button auth" msgid "Shut Down…" -msgstr "Shut Down…" +msgstr "Switch Off…" #. TRANSLATORS: This button appears on the logout dialog when #. there are updates that require restart. It will do a restart diff --git a/po/en_CA.po b/po/en_CA.po index 07bfa3c..2ec61de 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -70,7 +70,7 @@ msgstr "Lock Screen" #: ../data/indicator-session-shutdown.desktop.in.in.h:1 #: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716 msgid "Shut Down" -msgstr "Shut Down" +msgstr "Switch Off" #: ../data/indicator-session-logout.desktop.in.in.h:1 #: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672 @@ -92,7 +92,7 @@ msgstr "Restart…" #: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721 msgid "Shut Down…" -msgstr "Shut Down…" +msgstr "Switch Off…" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:35 @@ -110,7 +110,7 @@ msgstr "Restart" #: ../src/dialog.c:37 msgctxt "title" msgid "Shut Down" -msgstr "Shut Down" +msgstr "Switch Off" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:41 @@ -130,7 +130,7 @@ msgstr "" msgid "" "Are you sure you want to close all programs and shut down the computer?" msgstr "" -"Are you sure you want to close all programs and shut down the computer?" +"Are you sure you want to close all programs and switch off the computer?" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:47 @@ -148,7 +148,7 @@ msgstr "Restart" #: ../src/dialog.c:49 msgctxt "button" msgid "Shut Down" -msgstr "Shut Down" +msgstr "Switch Off" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:55 @@ -166,7 +166,7 @@ msgstr "" #: ../src/dialog.c:57 msgctxt "button auth" msgid "Shut Down…" -msgstr "" +msgstr "Switch Off…" #. TRANSLATORS: This button appears on the logout dialog when #. there are updates that require restart. It will do a restart diff --git a/po/en_GB.po b/po/en_GB.po index 312c348..09a87cd 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -42,7 +42,7 @@ msgstr "Remove the Restart item from the session menu" #: ../data/com.canonical.indicator.session.gschema.xml.in.h:6 msgid "Remove the shutdown item from the session menu" -msgstr "Remove the Shut Down item from the session menu" +msgstr "Remove the Switch Off item from the session menu" #: ../data/com.canonical.indicator.session.gschema.xml.in.h:7 msgid "Suppress the dialog to confirm logout, restart and shutdown action" @@ -72,7 +72,7 @@ msgstr "Lock Screen" #: ../data/indicator-session-shutdown.desktop.in.in.h:1 #: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716 msgid "Shut Down" -msgstr "Shut Down" +msgstr "Switch Off" #: ../data/indicator-session-logout.desktop.in.in.h:1 #: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672 @@ -94,7 +94,7 @@ msgstr "Restart…" #: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721 msgid "Shut Down…" -msgstr "Shut Down…" +msgstr "Switch Off…" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:35 @@ -112,7 +112,7 @@ msgstr "Restart" #: ../src/dialog.c:37 msgctxt "title" msgid "Shut Down" -msgstr "Shut Down" +msgstr "Switch Off" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:41 @@ -132,7 +132,7 @@ msgstr "" msgid "" "Are you sure you want to close all programs and shut down the computer?" msgstr "" -"Are you sure you want to close all programs and shut down the computer?" +"Are you sure you want to close all programs and switch off the computer?" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:47 @@ -150,7 +150,7 @@ msgstr "Restart" #: ../src/dialog.c:49 msgctxt "button" msgid "Shut Down" -msgstr "Shut Down" +msgstr "Switch Off" #. LOGOUT_DIALOG_LOGOUT, #: ../src/dialog.c:55 @@ -168,7 +168,7 @@ msgstr "Restart…" #: ../src/dialog.c:57 msgctxt "button auth" msgid "Shut Down…" -msgstr "Shut Down…" +msgstr "Switch Off…" #. TRANSLATORS: This button appears on the logout dialog when #. there are updates that require restart. It will do a restart 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/Makefile.in b/src/Makefile.in index 6993860..e920d93 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1149,43 +1149,43 @@ uninstall-am: uninstall-libexecPROGRAMS \ $(dbus_display_manager_sources): display-manager.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-display-manager \ $^ $(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 \ $^ $(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 \ $^ $(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 \ $^ $(dbus_accounts_sources): org.freedesktop.Accounts.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-accounts \ $^ $(dbus_user_sources): org.freedesktop.Accounts.User.xml - gdbus-codegen \ + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.freedesktop \ --generate-c-code dbus-user \ $^ $(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/dbus-accounts.c b/src/dbus-accounts.c index b013df0..17b28cd 100644 --- a/src/dbus-accounts.c +++ b/src/dbus-accounts.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-accounts.h b/src/dbus-accounts.h index 4999a2b..0c9dd2f 100644 --- a/src/dbus-accounts.h +++ b/src/dbus-accounts.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-consolekit-manager.c b/src/dbus-consolekit-manager.c index c032cd9..d934d2e 100644 --- a/src/dbus-consolekit-manager.c +++ b/src/dbus-consolekit-manager.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-consolekit-manager.h b/src/dbus-consolekit-manager.h index eddc6f1..9cac7b3 100644 --- a/src/dbus-consolekit-manager.h +++ b/src/dbus-consolekit-manager.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-consolekit-seat.c b/src/dbus-consolekit-seat.c index 368cddf..8bb8d0e 100644 --- a/src/dbus-consolekit-seat.c +++ b/src/dbus-consolekit-seat.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-consolekit-seat.h b/src/dbus-consolekit-seat.h index fd80a4a..787d0ce 100644 --- a/src/dbus-consolekit-seat.h +++ b/src/dbus-consolekit-seat.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-consolekit-session.c b/src/dbus-consolekit-session.c index ecb5173..85ed255 100644 --- a/src/dbus-consolekit-session.c +++ b/src/dbus-consolekit-session.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-consolekit-session.h b/src/dbus-consolekit-session.h index d827e77..68cb565 100644 --- a/src/dbus-consolekit-session.h +++ b/src/dbus-consolekit-session.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-display-manager.c b/src/dbus-display-manager.c index c2fc250..ed08688 100644 --- a/src/dbus-display-manager.c +++ b/src/dbus-display-manager.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-display-manager.h b/src/dbus-display-manager.h index b0fffc8..8a8177b 100644 --- a/src/dbus-display-manager.h +++ b/src/dbus-display-manager.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-upower.c b/src/dbus-upower.c index 1cdcc88..af91304 100644 --- a/src/dbus-upower.c +++ b/src/dbus-upower.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-upower.h b/src/dbus-upower.h index 65ea926..7360447 100644 --- a/src/dbus-upower.h +++ b/src/dbus-upower.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-user.c b/src/dbus-user.c index 027715c..785abcc 100644 --- a/src/dbus-user.c +++ b/src/dbus-user.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dbus-user.h b/src/dbus-user.h index 87eb9ce..48fa3a5 100644 --- a/src/dbus-user.h +++ b/src/dbus-user.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.10. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/src/dialog.c b/src/dialog.c index 7c562d5..eb91f57 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -34,7 +34,7 @@ with this program. If not, see . static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"), /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off") + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Shut Down") }; static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = { @@ -46,7 +46,7 @@ static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = { static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"), /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off") + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Shut Down") }; /* TRANSLATORS: These strings have an ellipsis so that the user knows @@ -54,7 +54,7 @@ static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"), /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart…"), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Switch Off…") + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down…") }; /* TRANSLATORS: This button appears on the logout dialog when diff --git a/src/indicator-session.c b/src/indicator-session.c index aa328dd..06a5a7b 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -64,6 +64,7 @@ struct _IndicatorSession GDBusProxy * service_proxy; GSettings * settings; DbusmenuClient * menu_client; + GtkIconTheme * icon_theme; }; static gboolean greeter_mode; @@ -84,6 +85,7 @@ static gboolean build_restart_item (DbusmenuMenuitem * newitem, DbusmenuClient * client, gpointer user_data); static void on_menu_layout_updated (DbusmenuClient * client, IndicatorSession * session); +static void indicator_session_update_icon_callback (GtkWidget * widget, gpointer callback_data); static void indicator_session_update_icon_and_a11y (IndicatorSession * self); static void indicator_session_update_users_label (IndicatorSession* self, const gchar* name); @@ -135,6 +137,13 @@ indicator_session_init (IndicatorSession *self) self->entry.image = GTK_IMAGE (gtk_image_new()); self->entry.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT)); + /* We need to check if the current icon theme has the hard coded icons. + * If not, we'll fall back to a standard icon */ + self->icon_theme = gtk_icon_theme_get_default(); + g_signal_connect(G_OBJECT(self->icon_theme), + "changed", + G_CALLBACK(indicator_session_update_icon_callback), self); + indicator_session_update_icon_and_a11y (self); g_settings_bind (self->settings, "show-real-name-on-panel", self->entry.label, "visible", @@ -304,8 +313,6 @@ new_user_item (DbusmenuMenuitem * newitem, g_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get (newitem, USER_ITEM_PROP_NAME)); - gtk_widget_show_all (user_item); - return TRUE; } @@ -478,6 +485,9 @@ indicator_session_update_icon_from_disposition (IndicatorSession * indicator, icon = ICON_ALERT; } + if (gtk_icon_theme_has_icon (indicator->icon_theme, icon) == FALSE) + icon = "gtk-missing-image"; + g_debug (G_STRLOC" setting icon to \"%s\"", icon); gtk_image_set_from_icon_name (GTK_IMAGE(indicator->entry.image), icon, @@ -514,6 +524,12 @@ calculate_disposition (IndicatorSession * indicator) return ret; } +static void +indicator_session_update_icon_callback (GtkWidget * widget, gpointer callback_data) +{ + indicator_session_update_icon_and_a11y ((IndicatorSession *)callback_data); +} + static void indicator_session_update_icon_and_a11y (IndicatorSession * indicator) { diff --git a/src/session-menu-mgr.c b/src/session-menu-mgr.c index 643abd1..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") @@ -506,7 +506,7 @@ build_session_menuitems (SessionMenuMgr* mgr) g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(action_func_spawn_async), CMD_LOGOUT); - mi = mgr->suspend_mi = mi_new ("Suspend"); + mi = mgr->suspend_mi = mi_new (_("Suspend")); dbusmenu_menuitem_child_append (mgr->top_mi, mi); g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(action_func_suspend), mgr); @@ -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