The in libplasma embedded ExtenderApplet actually works now!
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=860069
This commit is contained in:
parent
4156bbaed4
commit
7d9f3e29c1
@ -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<Plasma::Applet>(0, allArgs, &error);
|
||||
|
@ -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());
|
||||
|
Loading…
Reference in New Issue
Block a user