diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-24 10:25:25 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-24 10:25:25 -0500 |
| commit | 1e6cf587eaeb5c7e46a12ff0070b25c9730bb848 (patch) | |
| tree | e83d2db3e23b80e5d6bce685edef95bd8c7bd6d8 /debian | |
| parent | 3ce500e1375736a23d59f0410f25ab832ca4c77b (diff) | |
| download | ayatana-indicator-session-1e6cf587eaeb5c7e46a12ff0070b25c9730bb848.tar.gz ayatana-indicator-session-1e6cf587eaeb5c7e46a12ff0070b25c9730bb848.tar.bz2 ayatana-indicator-session-1e6cf587eaeb5c7e46a12ff0070b25c9730bb848.zip | |
Remove debian/patches/restore_lock_screen.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/restore_lock_screen.patch | 19 |
2 files changed, 1 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog index 230cdb5..700b62a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ indicator-session (0.2.6-0ubuntu3~ppa1) UNRELEASED; urgency=low * Upstream Merge * Fix strings to have all be "Shut Down" (LP: #545578) + * Remove debian/patches/restore_lock_screen.patch -- Ted Gould <ted@ubuntu.com> Wed, 24 Mar 2010 10:24:00 -0500 diff --git a/debian/patches/restore_lock_screen.patch b/debian/patches/restore_lock_screen.patch deleted file mode 100644 index 12a24d4..0000000 --- a/debian/patches/restore_lock_screen.patch +++ /dev/null @@ -1,19 +0,0 @@ -=== modified file 'src/lock-helper.c' ---- src/lock-helper.c 2010-03-18 19:19:39 +0000 -+++ src/lock-helper.c 2010-03-23 17:47:37 +0000 -@@ -131,11 +131,12 @@ - return FALSE; - } - -- if (gconf_client == NULL) { -+ /* if (gconf_client == NULL) { - gconf_client = gconf_client_get_default(); - } - -- return gconf_client_get_bool (gconf_client, GCONF_KEY, NULL); -+ return gconf_client_get_bool (gconf_client, GCONF_KEY, NULL); */ -+ return TRUE; - } - - /* When the screensave go active, if we've got a mainloop - |