Branch: master

c1e7f15e 2014-05-04 22:19:48 Timothy Pearson
Update redmond-default-settings* on Debian and Ubuntu to reflect latest SAK changes
M ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc
M ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc
M ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc
M ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc
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 b36d5b8..7534ece 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 @@
 [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 f71de01..150ed52 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 @@
 # Default is "twin"
 WindowManager=twin
 # SAK
-# Default is true
+# Default is false
 UseSAK=true
 # Admin session
 # Default is false
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc
index 32c9da8..e64b7ef 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc
@@ -37,3 +37,18 @@
 [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/debian/distrospecific/tdmdistrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc
index dc0a36c..ec02f7b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc
@@ -302,8 +302,8 @@
 # Default is "twin"
 #WindowManager=
 # SAK
-# Default is true
-#UseSAK=false
+# Default is false
+UseSAK=true
 # Admin session
 # Default is false
 #UseAdminSession=true