summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-18 00:51:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-18 00:51:56 +0000
commita56441c54627b3017e235317898a1bfb28859dc5 (patch)
treeb2e038f21a90b92d9f13ee9189de1c80f6643735 /kicker
parent4e9fd5f6e0d8c8c35087eb40939730b93ec8d108 (diff)
downloadtdebase-a56441c54627b3017e235317898a1bfb28859dc5.tar.gz
tdebase-a56441c54627b3017e235317898a1bfb28859dc5.zip
Same as prior commit
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176551 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker')
-rw-r--r--kicker/kicker/core/containerarea.cpp4
1 files changed, 4 insertions, 0 deletions
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();