unity-lens-applications

Merge lp:~jwhite-codeweavers/unity-lens-applications/fix-916201.trunk into lp:unity-lens-applications

  1. fix-916201.trunk
  2. Merge into trunk
Proposed by Jeremy White
Status: Merged
Approved by: Michal Hruby
Approved revision: 260
Merged at revision: 260
Proposed branch: lp:~jwhite-codeweavers/unity-lens-applications/fix-916201.trunk
Merge into: lp:unity-lens-applications
Diff against target: 12 lines (+1/-1)
1 file modified
src/daemon.vala (+1/-1)
To merge this branch: bzr merge lp:~jwhite-codeweavers/unity-lens-applications/fix-916201.trunk
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
Review via email: mp+89936@code.launchpad.net

Description of the change

Resubmit a proposed change to simply use the category to prevent colon and double underscore replacement on regular .desktop files. Fixes bug 916201.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/daemon.vala'
2--- src/daemon.vala 2012-01-23 14:04:57 +0000
3+++ src/daemon.vala 2012-01-24 16:27:55 +0000
4@@ -684,7 +684,7 @@
5
6 /* S-C uses "app_name:desktop_id.desktop", get rid of the prefix */
7 int colon_pos = desktop_id.index_of (":");
8- if (colon_pos > 0)
9+ if (category == Category.AVAILABLE && colon_pos > 0)
10 {
11 desktop_id = desktop_id[colon_pos+1:desktop_id.length];
12 /* well it's still not real desktop_id, S-C converts slashes to "__"

Subscribers

People subscribed via source and target branches