~ubuntu-branches/ubuntu/vivid/plasma-framework/vivid-proposed

« back to all changes in this revision

Viewing changes to src/plasma/containment.cpp

• browse files at revision 15
• compare with another revision
• download diff
• download tarball
• view history from revision 15

Show diffs side-by-side

added

removed

src/plasma/containment.cpp

508

508

    KConfigGroup cfg = d->containmentActionsConfig();

509

509

    ContainmentActions *plugin = 0;

510

510

 

511

 

    if (containmentActions().contains(trigger)) {

512

 

        plugin = containmentActions().value(trigger);

513

 

        if (plugin->pluginInfo().pluginName() != pluginName) {

514

 

            containmentActions().remove(trigger);

515

 

            delete plugin;

516

 

            plugin = 0;

517

 

        }

 

511

    plugin = containmentActions().value(trigger);

 

512

    if (plugin && plugin->pluginInfo().pluginName() != pluginName) {

 

513

        containmentActions().remove(trigger);

 

514

        delete plugin;

 

515

        plugin = 0;

518

516

    }

519

517

 

520

518

    if (pluginName.isEmpty()) {

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1