Merge lp://qastaging/~osomon/unity-2d/preferred-applications into lp://qastaging/unity-2d/3.0
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Olivier Tilloy | ||||||||
Approved revision: | 497 | ||||||||
Merged at revision: | 505 | ||||||||
Proposed branch: | lp://qastaging/~osomon/unity-2d/preferred-applications | ||||||||
Merge into: | lp://qastaging/unity-2d/3.0 | ||||||||
Diff against target: |
124 lines (+42/-7) 3 files modified
launcher/UnityApplications/launcherapplication.cpp (+9/-2) places/Home.qml (+3/-4) places/HomeButtonApplication.qml (+30/-1) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~osomon/unity-2d/preferred-applications | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Aurélien Gâteau (community) | Approve | ||
Review via email:
|
Commit message
[dash] Show preferred applications in the home screen.
If an application cannot be found, do not show it.
Description of the change
Note to the reviewer: the implementation differs from the one in Unity on the following two points:
- the default e-mail client is the one actually configured via gnome-default-
- I didn’t implement a whitelist fallback mechanism like Unity does: if the preferred application configured via gnome-default-
Works well, except if one tries to set KDE applications as defaults. See the end of the review for details.
Some questions, suggestions first:
# LauncherApplica tion::setDeskto pFile()
- Should the if newDesktopFile != oldDesktopFile be something like this instead?
""" ged(newDesktopF ile);
if (newDesktopFile == oldDesktopFile) {
return;
}
Q_EMIT desktopFileChan
"""
- Not really related to this MR but g_object_ unref(m_ appInfo) should be called before creating a new GDesktopAppInfo.
# places/ HomeButtonAppli cation. qml
- Having both desktopFile and desktop_file is quite confusing. application. desktop_ file should be renamed to application. desktopFile and code inside it should use parent.desktopFile to disambiguate.
# Problem with KDE applications
Assuming desktopFile == binaryName + ".desktop" makes it unpractical to set KDE applications as default. To set a KDE4 application as default I have to prefix its name with "kde4-" in gnome-default- application- properties.
The reason behind this is that KDE4 desktop files are all installed in /usr/share/ applications/ kde4, meaning their desktop file id is "kde4-$app.desktop" (see http:// standards. freedesktop. org/menu- spec/1. 0/go01. html#term- desktop- file-id ).