From 4f2f95ce18dc6290c3581b40ea4f20d05bd78d55 Mon Sep 17 00:00:00 2001 From: tpearson 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/desktop.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kdesktop/desktop.cc') diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index a3ddff56f..5696d2e4a 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -135,7 +135,7 @@ KDesktop::WheelDirection KDesktop::m_eWheelDirection = KDesktop::m_eDefaultWheel const char* KDesktop::m_wheelDirectionStrings[2] = { "Forward", "Reverse" }; KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) : - DCOPObject( "KDesktopIface" ), + KDesktopIface(), TQWidget( 0L, "desktop", (WFlags)(WResizeNoErase | ( x_root_hack ? (WStyle_Customize | WStyle_NoBorder) : 0)) ), // those two WStyle_ break kdesktop when the root-hack isn't used (no Dnd) startup_id( NULL ), m_waitForKicker(0) -- cgit v1.2.1