core/desktopentry: fix hidden entires and locale matching #246
+23
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bbedward
changed the title
bbedward
force-pushed
the
fix-hidden
branch
from
4130467 to
84c4146
Compare
bbedward
changed the title
bbedward
force-pushed
the
fix-hidden
branch
from
c044b6f to
5d3555d
Compare
3 tasks
outfoxxed
force-pushed
the
master
branch
2 times, most recently
from
e170d91 to
1d94144
Compare
outfoxxed
requested changes
Sep 30, 2025
Comment on lines
+510
to
+513
| auto lowerId = data.id.toLower(); | ||
|
|
||
| if (data.hidden) { | ||
| if (auto* victim = newEntries.take(data.id)) victim->deleteLater(); | ||
| newLowercaseEntries.remove(lowerId); | ||
|
|
||
| if (auto it = oldEntries.find(data.id); it != oldEntries.end()) { | ||
| it.value()->deleteLater(); | ||
| oldEntries.erase(it); | ||
| } | ||
|
|
||
| qCDebug(logDesktopEntry) << "Masking hidden desktop entry" << data.id; | ||
| continue; | ||
| } |
There was a problem hiding this comment.
- Why deleteLater?
- Is hidden supposed to match only things lower than it in the path, or things higher than it as well? Because this looks like its only matching things lower than it.
There was a problem hiding this comment.
- I just thought it's safer, if the object has any signals connected to ir and what not.
- Lower than it is the intention, that is my understanding of the specification
I mean my understanding of it is that only the highest priority desktop entry should be considered - so it shouldnt treat higher-prio entries as deleted.
bbedward
force-pushed
the
fix-hidden
branch
from
5d3555d to
f904284
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hidden desktop entries currently get parsed out, however all lower-ranked entires remain. So for example if I:
~/.local/share/applications/org.mozilla.Thunderbird.desktopwithHidden=true, it gets ignored by the parser. However the entry in/usr/share/applications/org.mozilla.Thunderbird.desktopdoes not get ignored.This fixes it by:
hiddenthrough the parsing stageAlso it fixes the locale matching, by disqualifying mismatching modifies.
An example if evolution, which matched
Name[en@shaw]=·𐑧𐑝𐑩𐑤𐑵𐑖𐑩𐑯when the locale wasen_USeven though the territory modifier was missing from the locale.Per the spec: https://specifications.freedesktop.org/desktop-entry-spec/latest/localized-keys.html