From 87a7c0f851ea1345ba1a54a14165a5f5eac16fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@suse.cz>
Date: Thu, 29 Sep 2011 16:19:47 +0200
Subject: [PATCH] Revert "fix commit 169a3d88, restoring the parameter is good,
 asserting it not"

This reverts commit 80f8a7b9f40ed48adbd5277b1f58e1651700b56c.
---
 kcmkwin/kwinrules/ruleswidget.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/kcmkwin/kwinrules/ruleswidget.cpp b/kcmkwin/kwinrules/ruleswidget.cpp
index 3c5ad4db54..8032840b45 100644
--- a/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kcmkwin/kwinrules/ruleswidget.cpp
@@ -388,9 +388,9 @@ static NET::WindowType comboToType(int val)
 
 void RulesWidget::setRules(Rules* rules)
 {
-    const bool readFromNewEmptyRules = !rules;
-    if (readFromNewEmptyRules)
-        rules = new Rules;
+    Rules tmp;
+
+    Q_ASSERT( rules );
 
     description->setText(rules->description);
     wmclass->setText(rules->wmclass);
@@ -451,11 +451,6 @@ void RulesWidget::setRules(Rules* rules)
     CHECKBOX_FORCE_RULE(strictgeometry,);
     CHECKBOX_FORCE_RULE(disableglobalshortcuts,);
     CHECKBOX_FORCE_RULE(blockcompositing,);
-
-    if (readFromNewEmptyRules) {
-        delete rules;
-        rules = NULL; // it's the function parameter...
-    }
 }
 
 #undef GENERIC_RULE