diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-13 04:09:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-13 04:09:29 +0000 |
| commit | 4f2f95ce18dc6290c3581b40ea4f20d05bd78d55 (patch) | |
| tree | dfe5142295b450df7d9838ed6ade1d1332377d22 /kdesktop/desktop.cc | |
| parent | bee265d85549eed053dfc1e6308f4b5dbd3f2536 (diff) | |
| download | tdebase-4f2f95ce18dc6290c3581b40ea4f20d05bd78d55.tar.gz tdebase-4f2f95ce18dc6290c3581b40ea4f20d05bd78d55.zip | |
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
Diffstat (limited to 'kdesktop/desktop.cc')
| -rw-r--r-- | kdesktop/desktop.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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) |