alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

X-Plasma-ContainmentType is Desktop by default

Browse Source 
so when searching for desktops also search those who don't have
This commit is contained in:
Marco Martin 2013-03-07 19:55:45 +01:00
parent dc9075f157
commit 0830c5047b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plasma/pluginloader.cpp
View File

@ -597,10 +597,15 @@ KPluginInfo::List PluginLoader::listContainmentsOfType(const QString &type,
if (!type.isEmpty()) { if (!type.isEmpty()) {
if (!constraint.isEmpty()) { if (!constraint.isEmpty()) {
constraint.append(" and "); constraint.append(" and (");
} }
constraint.append("'").append(type).append("' ~in [X-Plasma-ContainmentType]"); //constraint.append("'").append(type).append("' == [X-Plasma-ContainmentType]");
if (type == "Desktop") {
constraint += "not exist [X-Plasma-ContainmentType] or ";
}
constraint += "[X-Plasma-ContainmentType] == '" + type + "')";
//by default containments are Desktop, so is not mandatory to specify it
} }
if (!category.isEmpty()) { if (!category.isEmpty()) {
@ -615,7 +620,7 @@ KPluginInfo::List PluginLoader::listContainmentsOfType(const QString &type,
} }
KService::List offers = KServiceTypeTrader::self()->query("Plasma/Containment", constraint); KService::List offers = KServiceTypeTrader::self()->query("Plasma/Containment", constraint);
//kDebug() << "constraint was" << constraint << "which got us" << offers.count() << "matches"; kDebug() << "constraint was" << constraint << "which got us" << offers.count() << "matches";
return KPluginInfo::fromServices(offers); return KPluginInfo::fromServices(offers);
} }