Changeset View
Changeset View
Standalone View
Standalone View
src/plasma/containment.cpp
| Show First 20 Lines • Show All 511 Lines • ▼ Show 20 Line(s) | |||||
| 512 | } | 512 | } | ||
| 513 | 513 | | |||
| 514 | void Containment::setContainmentActions(const QString &trigger, const QString &pluginName) | 514 | void Containment::setContainmentActions(const QString &trigger, const QString &pluginName) | ||
| 515 | { | 515 | { | ||
| 516 | KConfigGroup cfg = d->containmentActionsConfig(); | 516 | KConfigGroup cfg = d->containmentActionsConfig(); | ||
| 517 | ContainmentActions *plugin = nullptr; | 517 | ContainmentActions *plugin = nullptr; | ||
| 518 | 518 | | |||
| 519 | plugin = containmentActions().value(trigger); | 519 | plugin = containmentActions().value(trigger); | ||
| 520 | if (plugin && plugin->pluginInfo().pluginName() != pluginName) { | 520 | if (plugin && plugin->metadata().pluginId() != pluginName) { | ||
| 521 | containmentActions().remove(trigger); | 521 | containmentActions().remove(trigger); | ||
| 522 | delete plugin; | 522 | delete plugin; | ||
| 523 | plugin = nullptr; | 523 | plugin = nullptr; | ||
| 524 | } | 524 | } | ||
| 525 | 525 | | |||
| 526 | if (pluginName.isEmpty()) { | 526 | if (pluginName.isEmpty()) { | ||
| 527 | cfg.deleteEntry(trigger); | 527 | cfg.deleteEntry(trigger); | ||
| 528 | } else if (plugin) { | 528 | } else if (plugin) { | ||
| ▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines | |||||