From 4f2f95ce18dc6290c3581b40ea4f20d05bd78d55 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 13 Jul 2011 04:09:29 +0000
Subject: Fix a second cause of the ever-ubiquitous Bug #456 This one is
 related to the MOC having a different idea of the data structure than the C
 compiler does in bgmanager.xx, thereby causing memory corruption when the
 bgmanager object attempts to access data members that the MOC did not add to
 the objects memory structure. Also apply the fix in r1420474 to KDesktopIface
 and KScreenSaverIface

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1241406 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdesktop/KDesktopIface.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'kdesktop/KDesktopIface.h')

diff --git a/kdesktop/KDesktopIface.h b/kdesktop/KDesktopIface.h
index abf98d93b..945fb4ca8 100644
--- a/kdesktop/KDesktopIface.h
+++ b/kdesktop/KDesktopIface.h
@@ -6,11 +6,13 @@
 #include <dcopobject.h>
 #include <dcopref.h>
 
-class KDesktopIface : virtual public DCOPObject
+class KDesktopIface : public DCOPObject
 {
     K_DCOP
 public:
 
+    KDesktopIface() : DCOPObject("KDesktopIface") {}
+
 k_dcop:
     /**
      * @internal
-- 
cgit v1.2.3