From 0fe77de70f0bec7892b215508f48c2ade09289e9 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Thu, 24 Apr 2008 16:16:50 +0000
Subject: [PATCH] when checking for custom containments, use >= now

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=800672
---
 containment.cpp | 4 ++--
 corona.cpp      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/containment.cpp b/containment.cpp
index 2ed679146..ff36327fa 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -865,7 +865,7 @@ Applet::List Containment::applets() const
 void Containment::setScreen(int screen)
 {
     // screen of -1 means no associated screen.
-    if (containmentType() == DesktopContainment || containmentType() == CustomContainment) {
+    if (containmentType() == DesktopContainment || containmentType() >= CustomContainment) {
 #ifndef Q_OS_WIN
         // we want to listen to changes in work area if our screen changes
         if (d->screen < 0 && screen > -1) {
@@ -894,7 +894,7 @@ void Containment::setScreen(int screen)
     //kDebug() << "setting screen to " << screen << "and type is" << containmentType();
     if (screen < numScreens && screen > -1) {
         if (containmentType() == DesktopContainment ||
-            containmentType() == CustomContainment) {
+            containmentType() >= CustomContainment) {
             resize(desktop->screenGeometry(screen).size());
         }
     }
diff --git a/corona.cpp b/corona.cpp
index d08bb3756..595bf8f2a 100644
--- a/corona.cpp
+++ b/corona.cpp
@@ -273,7 +273,7 @@ Containment* Corona::containmentForScreen(int screen) const
     foreach (Containment* containment, d->containments) {
         if (containment->screen() == screen &&
             (containment->containmentType() == Containment::DesktopContainment ||
-             containment->containmentType() == Containment::CustomContainment)) {
+             containment->containmentType() >= Containment::CustomContainment)) {
             return containment;
         }
     }