summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2014-05-12 21:02:00 +0200
committerFrançois Andriot <[email protected]>2014-05-12 21:02:00 +0200
commit31c67d4e8e97637bbd0fa759d466283be853d7cf (patch)
treeb121ec52fde38c8922ff62982cdbed164f1dd0af /ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific
parentd7d223089e5b7d84834b970ef6c9cbcb212195ba (diff)
parent9dbf2baac1b18a2cf7188ae624fc807a98f11d21 (diff)
downloadtde-packaging-31c67d4e8e97637bbd0fa759d466283be853d7cf.tar.gz
tde-packaging-31c67d4e8e97637bbd0fa759d466283be853d7cf.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific')
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc15
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc2
2 files changed, 16 insertions, 1 deletions
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc
index b36d5b88b..7534ece0e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc
@@ -37,3 +37,18 @@ exclude=media/hdd_mounted,media/nfs_mounted,media/floppy5_unmounted,media/cdrom_
[MiniCli]
MiniCLIFilesystemAutoComplete=true
MiniCLIHistoryAndFilesystemAutoComplete=true
+
+[ScreenSaver]
+DelaySaverStart=true
+Enabled=true
+HideActiveWindowsFromSaver=true
+HideCancelButton=true
+Lock=true
+LockGrace=1000
+Saver=KBanner.desktop
+Timeout=300
+UseTDESAK=true
+UseUnmanagedLockWindows=false
+
+[Version]
+KDEVersionMajor=14
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc
index f71de012c..150ed529e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc
@@ -302,7 +302,7 @@ Compositor=compton-tde
# Default is "twin"
WindowManager=twin
# SAK
-# Default is true
+# Default is false
UseSAK=true
# Admin session
# Default is false