Commit 4437b2a3 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau

Merge branch 'Plasma/5.12' into Plasma/5.13

parents f040cdb3 6f491642
......@@ -222,7 +222,9 @@ void KDEDConfig::load()
// autoload defaults to false if it is not found
const bool autoload = mod.rawData().value(QStringLiteral("X-KDE-Kded-autoload")).toVariant().toBool();
const QString dbusModuleName = mod.value(QStringLiteral("X-KDE-DBus-ModuleName"));
// keep estimating dbusModuleName in sync with KDEDModule (kdbusaddons) and kded (kded)
// currently (KF5) the module name in the D-Bus object path is set by the pluginId
const QString dbusModuleName = mod.pluginId();
qCDebug(KCM_KDED) << "reading kded info from" << servicePath << "autoload =" << autoload << "dbus module name =" << dbusModuleName;
// The logic has to be identical to Kded::initModules.
......@@ -234,12 +236,7 @@ void KDEDConfig::load()
treeitem->setText(StartupService, mod.name());
treeitem->setText(StartupDescription, mod.description());
treeitem->setText(StartupStatus, NOT_RUNNING);
if (!dbusModuleName.isEmpty()) {
treeitem->setData(StartupService, LibraryRole, dbusModuleName);
} else {
qCWarning(KCM_KDED) << "X-KDE-DBUS-ModuleName not set for module " << mod.name() << "from file" << mod.metaDataFileName();
treeitem->setData(StartupService, LibraryRole, mod.fileName());
}
treeitem->setData(StartupService, LibraryRole, dbusModuleName);
_lvStartup->addTopLevelItem(treeitem);
}
else if (isModuleLoadedOnDemand(mod)) {
......@@ -247,12 +244,7 @@ void KDEDConfig::load()
treeitem->setText(OnDemandService, mod.name() );
treeitem->setText(OnDemandDescription, mod.description());
treeitem->setText(OnDemandStatus, NOT_RUNNING);
if (!dbusModuleName.isEmpty()) {
treeitem->setData(OnDemandService, LibraryRole, dbusModuleName);
} else {
qCWarning(KCM_KDED) << "X-KDE-DBUS-ModuleName not set for module " << mod.name() << "from file" << mod.metaDataFileName();
treeitem->setData(OnDemandService, LibraryRole, mod.fileName());
}
treeitem->setData(OnDemandService, LibraryRole, dbusModuleName);
_lvLoD->addTopLevelItem(treeitem);
}
else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment