[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/plasma/applets/kickoff/core
From: Aaron J. Seigo <aseigo () kde ! org>
Date: 2009-05-27 18:34:24
Message-ID: 1243449264.610759.13816.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 973720 by aseigo:
check for exec() dupes first
BUG:194306
M +7 -7 searchmodel.cpp
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/core/searchmodel.cpp #973719:973720
@@ -166,18 +166,18 @@
int existingPos = desktopNames.value(service->name(), -1);
KService::Ptr existing = existingPos < 0 ? KService::Ptr(0) : results[existingPos];
- if (existing.isNull()) {
+ if (execFields.contains(service->exec()) || service->noDisplay()) {
+ // do not show more than one entry which does the same thing when run
+ // (ie. ignore entries that have an identical 'Exec' field to an existing
+ // entry)
+ results[i] = 0;
+ } else if (existing.isNull()) {
desktopNames.insert(service->name(), i);
execFields.insert(service->exec());
} else if (isLaterVersion(existing, service)) {
- results[i] = 0;
+ results[i] = 0;
} else if (isLaterVersion(service, existing)) {
results[existingPos] = 0;
- } else if (execFields.contains(service->exec()) && service->noDisplay()) {
- // do not show more than one entry which does the same thing when run
- // (ie. ignore entries that have an identical 'Exec' field to an existing
- // entry)
- results[i] = 0;
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic