Session Menu

Merge lp:~bratsche/indicator-session/ellipsize into lp:indicator-session/0.1

  1. ellipsize
  2. Merge into trunk
Proposed by Cody Russell
Status: Merged
Merged at revision: 124
Proposed branch: lp:~bratsche/indicator-session/ellipsize
Merge into: lp:indicator-session/0.1
Diff against target: 51 lines (+6/-6)
1 file modified
src/session-service.c (+6/-6)
To merge this branch: bzr merge lp:~bratsche/indicator-session/ellipsize
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+31540@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/session-service.c'
--- src/session-service.c 2010-04-06 22:26:41 +0000
+++ src/session-service.c 2010-08-02 13:53:45 +0000
@@ -629,7 +629,7 @@
629 if (supress_confirmations()) {629 if (supress_confirmations()) {
630 dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));630 dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));
631 } else {631 } else {
632 dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out..."));632 dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out\342\200\246"));
633 }633 }
634 dbusmenu_menuitem_property_set_bool(logout_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_logout());634 dbusmenu_menuitem_property_set_bool(logout_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_logout());
635 dbusmenu_menuitem_child_append(root, logout_mi);635 dbusmenu_menuitem_child_append(root, logout_mi);
@@ -654,7 +654,7 @@
654 if (supress_confirmations()) {654 if (supress_confirmations()) {
655 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));655 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));
656 } else {656 } else {
657 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart..."));657 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246"));
658 }658 }
659 dbusmenu_menuitem_property_set_bool(restart_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_restart());659 dbusmenu_menuitem_property_set_bool(restart_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_restart());
660 dbusmenu_menuitem_child_append(root, restart_mi);660 dbusmenu_menuitem_child_append(root, restart_mi);
@@ -664,7 +664,7 @@
664 if (supress_confirmations()) {664 if (supress_confirmations()) {
665 dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));665 dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));
666 } else {666 } else {
667 dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));667 dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down\342\200\246"));
668 }668 }
669 dbusmenu_menuitem_property_set_bool(shutdown_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_shutdown());669 dbusmenu_menuitem_property_set_bool(shutdown_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_shutdown());
670 dbusmenu_menuitem_child_append(root, shutdown_mi);670 dbusmenu_menuitem_child_append(root, shutdown_mi);
@@ -728,9 +728,9 @@
728728
729 if (restart_required) {729 if (restart_required) {
730 if (supress_confirmations()) {730 if (supress_confirmations()) {
731 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required"));731 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update"));
732 } else {732 } else {
733 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required..."));733 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update\342\200\246"));
734 }734 }
735 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel");735 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel");
736 if (session_dbus != NULL) {736 if (session_dbus != NULL) {
@@ -740,7 +740,7 @@
740 if (supress_confirmations()) {740 if (supress_confirmations()) {
741 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));741 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));
742 } else {742 } else {
743 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart..."));743 dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246"));
744 }744 }
745 dbusmenu_menuitem_property_remove(restart_mi, RESTART_ITEM_ICON);745 dbusmenu_menuitem_property_remove(restart_mi, RESTART_ITEM_ICON);
746 if (session_dbus != NULL) {746 if (session_dbus != NULL) {

Subscribers

People subscribed via source and target branches