Same as prior commit

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176551 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 5 insertions, 1 deletions

diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index a2f23dfaf..2f5d730f3 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -132,7 +132,7 @@
       <whatsthis></whatsthis>
     </entry>
     <entry key="ShadowEnabled" type="Bool">
-      <default>true</default>
+      <default>false</default>
       <label>Enable text shadow</label>
       <whatsthis>Check here to enable a shadow outline around the desktop font. This also improves the readability of the desktop text against backgrounds of a similar color.</whatsthis>
     </entry>
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 779555a3d..8fd839a20 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -65,6 +65,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "containerarea.h"
 
+// #define INCLUDE_LOCK_APPLET_BY_DEFAULT
+
 // for multihead
 extern int kicker_screen_number;
 
@@ -265,6 +267,7 @@ void ContainerArea::defaultContainerConfig()
         containers.append(a);
     }
 
+#ifdef INCLUDE_LOCK_APPLET_BY_DEFAULT
     // lock applet
     a = manager->createAppletContainer(
         "lockout.desktop",
@@ -277,6 +280,7 @@ void ContainerArea::defaultContainerConfig()
         a->setFreeSpace(1);
         containers.append(a);
     }
+#endif
 
     for (BaseContainer::Iterator it = containers.begin();
          it != containers.end();