diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-03 21:06:00 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-03 21:06:00 -0600 |
| commit | d9bc98c8b728ffce04d5536501efb11a6084c831 (patch) | |
| tree | 22f77b0048967d522ca9dea9c664adf286408c07 /src/gtk-dialog/gconf-helper.c | |
| parent | 4533e76797864b2e949ffa150359145d861f0045 (diff) | |
| parent | 1af7a048d62b8616d3182a8bb48fe33e7b54d93d (diff) | |
| download | ayatana-indicator-session-d9bc98c8b728ffce04d5536501efb11a6084c831.tar.gz ayatana-indicator-session-d9bc98c8b728ffce04d5536501efb11a6084c831.tar.bz2 ayatana-indicator-session-d9bc98c8b728ffce04d5536501efb11a6084c831.zip | |
* Upstream Merge
* Fix naming to "Switch off" and "Sleep"
* Blocking the current user from the user list
* Change sorting to be based on real names and handle conflicts
* Removing some ConsoleKit errors
* Memory leak on PangoLayout allocation
* Don't set GTK decorations
* ConsoleKit fallback if gnome-session not available
Diffstat (limited to 'src/gtk-dialog/gconf-helper.c')
| -rw-r--r-- | src/gtk-dialog/gconf-helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtk-dialog/gconf-helper.c b/src/gtk-dialog/gconf-helper.c index 213592e..9262b19 100644 --- a/src/gtk-dialog/gconf-helper.c +++ b/src/gtk-dialog/gconf-helper.c @@ -51,11 +51,11 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC if (gconf_value_get_bool (value)) { dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off")); } else { dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out...")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown...")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off...")); } } } |