aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2010-08-05 12:41:11 +0200
committerSebastien Bacher <seb128@ubuntu.com>2010-08-05 12:41:11 +0200
commit906f7922bbf1875f3fd666ff1e40f1635c52af4c (patch)
tree89b19d952889c1d4f7bd461a8b240fbc75f44624 /src
parent469cf99aba753cfab399c9834b37f92ddbf68560 (diff)
parent453b8f9d9448206df1dba6307f3931f9c44687be (diff)
downloadayatana-indicator-session-906f7922bbf1875f3fd666ff1e40f1635c52af4c.tar.gz
ayatana-indicator-session-906f7922bbf1875f3fd666ff1e40f1635c52af4c.tar.bz2
ayatana-indicator-session-906f7922bbf1875f3fd666ff1e40f1635c52af4c.zip
Import upstream version 0.2.9
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in5
-rw-r--r--src/session-service.c12
2 files changed, 10 insertions, 7 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index f82d32f..9e4836b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -40,7 +40,10 @@ libexec_PROGRAMS = indicator-session-service$(EXEEXT) \
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/src/session-service.c b/src/session-service.c
index 4fc12a1..5d2ca1c 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -629,7 +629,7 @@ rebuild_items (DbusmenuMenuitem *root,
if (supress_confirmations()) {
dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));
} else {
- dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out..."));
+ dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out\342\200\246"));
}
dbusmenu_menuitem_property_set_bool(logout_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_logout());
dbusmenu_menuitem_child_append(root, logout_mi);
@@ -654,7 +654,7 @@ rebuild_items (DbusmenuMenuitem *root,
if (supress_confirmations()) {
dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));
} else {
- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart..."));
+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246"));
}
dbusmenu_menuitem_property_set_bool(restart_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_restart());
dbusmenu_menuitem_child_append(root, restart_mi);
@@ -664,7 +664,7 @@ rebuild_items (DbusmenuMenuitem *root,
if (supress_confirmations()) {
dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));
} else {
- dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));
+ dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down\342\200\246"));
}
dbusmenu_menuitem_property_set_bool(shutdown_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_shutdown());
dbusmenu_menuitem_child_append(root, shutdown_mi);
@@ -728,9 +728,9 @@ restart_dir_changed (void)
if (restart_required) {
if (supress_confirmations()) {
- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required"));
+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update"));
} else {
- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required..."));
+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update\342\200\246"));
}
dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel");
if (session_dbus != NULL) {
@@ -740,7 +740,7 @@ restart_dir_changed (void)
if (supress_confirmations()) {
dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart"));
} else {
- dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart..."));
+ dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246"));
}
dbusmenu_menuitem_property_remove(restart_mi, RESTART_ITEM_ICON);
if (session_dbus != NULL) {