alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

double check the clipboard object

Browse Source 
BUG:217098

svn path=/trunk/KDE/kdelibs/; revision=1057509
This commit is contained in:
Aaron J. Seigo 2009-12-02 17:16:18 +00:00
parent bdd761cd4c
commit bf404da15e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
containment.cpp
View File

@ -1287,7 +1287,6 @@ void ContainmentPrivate::dropData(QPointF scenePos, QPoint screenPos, QGraphicsS
Applet *applet = q->addApplet("internal:extender", QVariantList(), geometry); Applet *applet = q->addApplet("internal:extender", QVariantList(), geometry);
item->setExtender(applet->extender()); item->setExtender(applet->extender());
} }
} else if (KUrl::List::canDecode(mimeData)) { } else if (KUrl::List::canDecode(mimeData)) {
//TODO: collect the mimetypes of available script engines and offer //TODO: collect the mimetypes of available script engines and offer
// to create widgets out of the matching URLs, if any // to create widgets out of the matching URLs, if any
@ -1370,8 +1369,17 @@ void ContainmentPrivate::dropData(QPointF scenePos, QPoint screenPos, QGraphicsS
} }
if (!selectedPlugin.isEmpty()) { if (!selectedPlugin.isEmpty()) {
if (!dropEvent) {
// since we may have entered an event loop up above with the menu,
// the clipboard item may no longer be valid, as QClipboard resets
// the object behind the back of the application with a zero timer
// so we fetch it again here
QClipboard *clipboard = QApplication::clipboard();
mimeData = clipboard->mimeData(QClipboard::Selection);
}
KTemporaryFile tempFile; KTemporaryFile tempFile;
if (tempFile.open()) { if (mimeData && tempFile.open()) {
//TODO: what should we do with files after the applet is done with them?? //TODO: what should we do with files after the applet is done with them??
tempFile.setAutoRemove(false); tempFile.setAutoRemove(false);