From 7d9f3e29c1902b5cbfa060228bd9189670aada0b Mon Sep 17 00:00:00 2001 From: Rob Scheepmaker Date: Thu, 11 Sep 2008 21:21:18 +0000 Subject: [PATCH] The in libplasma embedded ExtenderApplet actually works now! svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=860069 --- applet.cpp | 4 ++-- extenderitem.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applet.cpp b/applet.cpp index 27ad9fc40..c2225bc03 100644 --- a/applet.cpp +++ b/applet.cpp @@ -1359,7 +1359,7 @@ Applet* Applet::load(const QString& appletName, uint appletId, const QVariantLis KPluginLoader plugin(*offer); - if (!Plasma::isPluginVersionCompatible(plugin.pluginVersion())) { + if (!Plasma::isPluginVersionCompatible(plugin.pluginVersion()) && (appletName != "extender")) { return 0; } @@ -1368,7 +1368,7 @@ Applet* Applet::load(const QString& appletName, uint appletId, const QVariantLis QString error; Applet *applet; - if (appletName == "extenderapplet") { + if (appletName == "extender") { applet = new ExtenderApplet(0, allArgs); } else { applet = offer->createInstance(0, allArgs, &error); diff --git a/extenderitem.cpp b/extenderitem.cpp index d37ae9dec..922567bec 100644 --- a/extenderitem.cpp +++ b/extenderitem.cpp @@ -866,7 +866,7 @@ void ExtenderItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) mousePos = d->scenePosFromScreenPos(event->screenPos() - d->mousePos); foreach (Containment *containment, corona->containments()) { if (containment->sceneBoundingRect().contains(mousePos)) { - Applet *applet = containment->addApplet("extenderapplet", + Applet *applet = containment->addApplet("extender", QVariantList(), QRectF(mousePos, size())); setExtender(applet->extender());