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/KScreensaverIface.h | |
| 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/KScreensaverIface.h')
| -rw-r--r-- | kdesktop/KScreensaverIface.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kdesktop/KScreensaverIface.h b/kdesktop/KScreensaverIface.h index 0ed26b67a..de5c19f2b 100644 --- a/kdesktop/KScreensaverIface.h +++ b/kdesktop/KScreensaverIface.h @@ -4,11 +4,13 @@ #include <dcopobject.h> -class KScreensaverIface : virtual public DCOPObject +class KScreensaverIface : public DCOPObject { K_DCOP public: + KScreensaverIface() : DCOPObject("KScreensaverIface") {} + k_dcop: /** Lock the screen now even if the screensaver does not lock by default. */ virtual void lock() = 0; |