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

[Jeremy White]

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

[Mikkel Kamstrup Erlandsen (kamstrup)]

Thanks for back porting this Jeremy. Looks fine (still :-))

review: Approve

Unmerged revisions

250. By Jeremy White on 2012-01-24

Do not perform : and __ replacement on regular application files, only
ones that come from searching via Software Center. Fixes bug 916201.

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-01-06 11:57:40 +0000
+++ src/daemon.vala	2012-01-24 16:36:24 +0000
@@ -628,7 +628,7 @@
 
         /* S-C uses "app_name:desktop_id.desktop", get rid of the prefix */
         int colon_pos = desktop_id.index_of (":");
-        if (colon_pos > 0)
+        if (category == Category.AVAILABLE && colon_pos > 0)
         {
           desktop_id = desktop_id[colon_pos+1:desktop_id.length];
           /* well it's still not real desktop_id, S-C converts slashes to "__"