summaryrefslogtreecommitdiffstats
path: root/kdesktop/desktop.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-08 19:47:41 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-08 19:47:41 +0000
commit20957d880f050d82c71939cb750c54a6dcfd70f4 (patch)
treed513e74daa32b26688133f2f87f0646df82fe2bc /kdesktop/desktop.h
parent6171b5113040c768f68b673ec0e8ae2f82c64391 (diff)
downloadtdebase-20957d880f050d82c71939cb750c54a6dcfd70f4.tar.gz
tdebase-20957d880f050d82c71939cb750c54a6dcfd70f4.zip
Revert patch r1227273 due to a desktop drag-and-drop bug it introduced
This temporarily reintroduces bug 456 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1240473 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop/desktop.h')
-rw-r--r--kdesktop/desktop.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index ceb3bf1dc..be1aeb796 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -21,7 +21,6 @@
#define __desktop_h__
#include "KDesktopIface.h"
-#include "bgmanager.h"
#include <tqwidget.h>
#include <tqstringlist.h>
@@ -191,7 +190,7 @@ private:
KWinModule* m_pKwinmodule;
- KBackgroundManager bgMgr;
+ KBackgroundManager* bgMgr;
KDIconView *m_pIconView;
KRootWidget *m_pRootWidget;