diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | plugins/unityshell/unityshell.xml.in | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 7a87fb270..ca2b1a936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ unity (5.2.0-0ubuntu2) UNRELEASED; urgency=low - * Cheery-pick a fix for a 5.0 crasher (LP: #916228) + * Cherry-pick upstream: + - a fix for a 5.0 crasher (LP: #916228) + - default configuration now to "always lock" * debian/profile_upgrade/com.canonical.unity.unity.03.upgrade, debian/unity-common.install: - enabling user profile upgrade installation diff --git a/plugins/unityshell/unityshell.xml.in b/plugins/unityshell/unityshell.xml.in index f59218603..34ad85d70 100644 --- a/plugins/unityshell/unityshell.xml.in +++ b/plugins/unityshell/unityshell.xml.in @@ -47,7 +47,7 @@ <_long>Make the launcher hide automatically after some time of inactivity: always or just when the focussed window is not over the launcher</_long> <min>0</min> <max>3</max> - <default>2</default> + <default>0</default> <desc> <value>0</value> <_name>Never</_name> |