diff options
| author | Ted Gould <ted@canonical.com> | 2009-11-04 15:46:57 -0600 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-11-04 15:46:57 -0600 |
| commit | b696b498905c040f408b4dc9ab1065adc03b27ad (patch) | |
| tree | ecb6cfc82c17338520e8ba5ed2eb7e41a6f98c2c | |
| parent | e33e7e675cea64aa316f457a619465d3baf4536f (diff) | |
| parent | 035a5078a63a8a2773cd07b5138c6903c0e579ef (diff) | |
| download | ayatana-indicator-session-b696b498905c040f408b4dc9ab1065adc03b27ad.tar.gz ayatana-indicator-session-b696b498905c040f408b4dc9ab1065adc03b27ad.tar.bz2 ayatana-indicator-session-b696b498905c040f408b4dc9ab1065adc03b27ad.zip | |
Merging from desktop
| -rw-r--r-- | debian/changelog | 22 | ||||
| -rw-r--r-- | debian/patches/01_locking_on_autologin.patch | 15 | ||||
| -rw-r--r-- | src/lock-helper.c | 2 |
3 files changed, 36 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 2bd0369..b5afa77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,27 @@ -indicator-session (0.1.7-0ubuntu1~ppa2) karmic; urgency=low +indicator-session (0.1.7-0ubuntu3~ppa1) karmic; urgency=low * Listen on DBus for MissionControl coming on and off the bus as EmpathyAccountManager used to do that for us before. + * Remove debian/patches/mc5-fixes.patch -- Ted Gould <ted@ubuntu.com> Sat, 10 Oct 2009 08:44:16 -0400 -indicator-session (0.1.7-0ubuntu1~ppa1) karmic; urgency=low +indicator-session (0.1.7-0ubuntu3) karmic; urgency=low + + * debian/patches/01_locking_on_autologin.patch: + - don't stop users to lock their screen on autologin configs, + thank David Barth (lp: #438936) + + -- Sebastien Bacher <seb128@ubuntu.com> Wed, 14 Oct 2009 19:16:24 +0200 + +indicator-session (0.1.7-0ubuntu2) karmic; urgency=low + + * debian/patches/mc5-fixes.patch (LP: #427643) + - Fix presence in mc5 + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 09 Oct 2009 08:20:46 +0200 + +indicator-session (0.1.7-0ubuntu1) karmic; urgency=low * Upstream release 0.1.7 * Changing the icon so that if you are disconnected it is @@ -24,7 +40,7 @@ indicator-session (0.1.7-0ubuntu1~ppa1) karmic; urgency=low -- Ted Gould <ted@ubuntu.com> Thu, 08 Oct 2009 11:12:07 -0400 -indicator-session (0.1.6-0ubuntu2) UNRELEASED; urgency=low +indicator-session (0.1.6-0ubuntu2) karmic; urgency=low * debian/patches/switch_user_lp-444494.patch - String change, "New Session" to "Switch User" (LP: #444494) diff --git a/debian/patches/01_locking_on_autologin.patch b/debian/patches/01_locking_on_autologin.patch new file mode 100644 index 0000000..88b255f --- /dev/null +++ b/debian/patches/01_locking_on_autologin.patch @@ -0,0 +1,15 @@ +diff -Nur -x '*.orig' -x '*~' indicator-session-0.1.7/src/lock-helper.c indicator-session-0.1.7.new/src/lock-helper.c +--- indicator-session-0.1.7/src/lock-helper.c 2009-10-14 19:15:55.000000000 +0200 ++++ indicator-session-0.1.7.new/src/lock-helper.c 2009-10-14 19:16:16.000000000 +0200 +@@ -130,9 +130,11 @@ + gboolean + will_lock_screen (void) + { ++/* + if (gdm_auto_login) { + return FALSE; + } ++*/ + if (is_guest) { + return FALSE; + } diff --git a/src/lock-helper.c b/src/lock-helper.c index 0bdec6c..02d0f96 100644 --- a/src/lock-helper.c +++ b/src/lock-helper.c @@ -130,9 +130,11 @@ lock_screen_gdm_cb_set (gdm_autologin_cb_t cb) gboolean will_lock_screen (void) { +/* if (gdm_auto_login) { return FALSE; } +*/ if (is_guest) { return FALSE; } |