aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-10-06 18:07:33 -0400
committerTed Gould <ted@canonical.com>2009-10-06 18:07:33 -0400
commitf0472c4c020e7167690b8c2e07e5c73120e7187e (patch)
tree103561d0dbb6d577398fc267fda5de4168957d15
parent6a03cb8f3370e032b9fbf7b6bb3082e32d6e206a (diff)
parenta792c0de053093e09a3ca469b63fda56429b8ecb (diff)
downloadayatana-indicator-session-f0472c4c020e7167690b8c2e07e5c73120e7187e.tar.gz
ayatana-indicator-session-f0472c4c020e7167690b8c2e07e5c73120e7187e.tar.bz2
ayatana-indicator-session-f0472c4c020e7167690b8c2e07e5c73120e7187e.zip
Update from ubuntu-desktop
-rw-r--r--debian/changelog13
-rw-r--r--debian/patches/switch_user_lp-444494.patch13
2 files changed, 23 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index f9619d2..8081ae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-indicator-session (0.1.6-0ubuntu1~ppa1) karmic; urgency=low
+indicator-session (0.1.6-0ubuntu2) UNRELEASED; urgency=low
- * Upstream release 0.1.6
+ * debian/patches/switch_user_lp-444494.patch
+ - String change, "New Session" to "Switch User" (LP: #444494)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 06 Oct 2009 10:44:57 -0400
+
+indicator-session (0.1.6-0ubuntu1) karmic; urgency=low
+
+ * Upstream release 0.1.6 (LP: #440216)
* Making startup of services asynchronous (LP: #436181)
* Disabling "Lock Screen" item when action is blocked by
GDM autologin (LP: #436724)
* Disabling "Lock Screen" in guest session (LP: #439068)
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 15:26:19 -0500
+ -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 23:33:25 +0200
indicator-session (0.1.5-0ubuntu2) karmic; urgency=low
diff --git a/debian/patches/switch_user_lp-444494.patch b/debian/patches/switch_user_lp-444494.patch
new file mode 100644
index 0000000..6c4bdf8
--- /dev/null
+++ b/debian/patches/switch_user_lp-444494.patch
@@ -0,0 +1,13 @@
+=== modified file 'src/users-service.c'
+--- src/users-service.c 2009-09-30 02:03:36 +0000
++++ src/users-service.c 2009-10-05 20:38:14 +0000
+@@ -342,7 +342,7 @@
+ if (check_new_session ())
+ {
+ mi = dbusmenu_menuitem_new ();
+- dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_LABEL, _("New Session..."));
++ dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User..."));
+ dbusmenu_menuitem_child_append (root, mi);
+ g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL);
+ }
+