From 1e6cf587eaeb5c7e46a12ff0070b25c9730bb848 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 24 Mar 2010 10:25:25 -0500 Subject: Remove debian/patches/restore_lock_screen.patch --- debian/changelog | 1 + debian/patches/restore_lock_screen.patch | 19 ------------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 debian/patches/restore_lock_screen.patch (limited to 'debian') 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 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 - -- cgit v1.2.3