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

Fixes a bug for when no event is passed.

Browse Source 
In ContainmentPrivate::dropData, some bits assumed there was a dropEvent passed.
This doesn't always happen, for instance with ContainmentActions::paste(). The
points needed are instead taken from the scenePos and screenPos.

BUG: 196416

svn path=/trunk/KDE/kdelibs/; revision=1060831
This commit is contained in:
Trever Fischer 2009-12-10 02:16:49 +00:00
parent eb13d0f4cd
commit 1377d35138
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
containment.cpp
View File

@ -1294,7 +1294,10 @@ void ContainmentPrivate::dropData(QPointF scenePos, QPoint screenPos, QGraphicsS
foreach (const KUrl &url, urls) {
if (AccessManager::supportedProtocols().contains(url.protocol())) {
AccessAppletJob *job = AccessManager::self()->accessRemoteApplet(url);
dropPoints[job] = dropEvent->pos();
if (dropEvent)
dropPoints[job] = dropEvent->pos();
else
dropPoints[job] = scenePos;
QObject::connect(AccessManager::self(), SIGNAL(finished(Plasma::AccessAppletJob*)),
q, SLOT(remoteAppletReady(Plasma::AccessAppletJob*)));
} else {
@ -1308,14 +1311,20 @@ void ContainmentPrivate::dropData(QPointF scenePos, QPoint screenPos, QGraphicsS
// It may be a directory or a file, let's stat
KIO::JobFlags flags = KIO::HideProgressInfo;
KIO::TransferJob *job = KIO::get(url, KIO::NoReload, flags);
dropPoints[job] = dropEvent->pos();
if (dropEvent)
dropPoints[job] = dropEvent->pos();
else
dropPoints[job] = scenePos;
QObject::connect(job, SIGNAL(result(KJob*)), q, SLOT(dropJobResult(KJob*)));
QObject::connect(job, SIGNAL(mimetype(KIO::Job *, const QString&)),
q, SLOT(mimeTypeRetrieved(KIO::Job *, const QString&)));
KMenu *choices = new KMenu("Content dropped");
choices->addAction(KIcon("process-working"), i18n("Fetching file type..."));
choices->popup(dropEvent->screenPos());
if (dropEvent)
choices->popup(dropEvent->screenPos());
else
choices->popup(screenPos);
dropMenus[job] = choices;
}
}