From 2b40492beaf61dc9c1fad301ed939a3b85ca2252 Mon Sep 17 00:00:00 2001
From: Rohan Ramdas Prabhu <rohan@rohanprabhu.com>
Date: Tue, 21 Sep 2010 14:48:17 +0000
Subject: [PATCH] Deleted property svnmerge-integrated.

A non-void function, Chelate::equivGen was reaching the end of function
without a return value, which could cause a segmentation fault. FIXED.

svn path=/trunk/KDE/kdebase/workspace/; revision=1177875
---
 scripting/chelate.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripting/chelate.cpp b/scripting/chelate.cpp
index 52756273a3..b4b7b6027b 100644
--- a/scripting/chelate.cpp
+++ b/scripting/chelate.cpp
@@ -291,6 +291,7 @@ QScriptValue KWin::Chelate::chelationEquivGen(QScriptContext* ctx, QScriptEngine
     
 QScriptValue KWin::Chelate::chelationCheck(QScriptContext* ctx, QScriptEngine* eng)
    {
+   Q_UNUSED(eng)
    QScriptValue key = ((ctx->callee()).data()).property("key");
    
    if(!key.isUndefined())
@@ -299,6 +300,8 @@ QScriptValue KWin::Chelate::chelationCheck(QScriptContext* ctx, QScriptEngine* e
        QScriptValue callBase = scCentral.property(key.toString());
        return (callBase.isFunction())?((callBase.call(scCentral)).toBool()):(callBase.toBool());
        }
+       
+   return eng->toScriptValue<bool>(0);
    }
     
 QScriptValue KWin::Chelate::chelationCheckGen(QScriptContext* ctx, QScriptEngine* eng)