Merge lp:~alecu/unity-lens-applications/deduplicate-clicks into lp:unity-lens-applications

[Alejandro J. Cura]

Do not include applications from click packages in the results

Do not include applications from click packages in the results

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:368
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/40

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/51/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[lp:~alecu/unity-lens-applications/deduplicate-clicks]

369. By Alejandro J. Cura on 2013-09-18

adding comment requested on review

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-autolanding/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-autolanding/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-autolanding/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-autolanding/23

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:369
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/52/rebuild

review: Approve (continuous-integration)

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-08-06 15:10:05 +0000
+++ src/daemon.vala	2013-09-18 16:09:56 +0000
@@ -1260,6 +1260,8 @@
           // XXX: This filtering should be pushed down to the Xapian
           // index and query builder logic.
           bool x_ubuntu_touch = false;
+          bool x_is_click = false;
+
           if (full_path != null)
           {
             GLib.KeyFile key_file = new GLib.KeyFile ();
@@ -1267,6 +1269,7 @@
             {
               key_file.load_from_file (full_path, GLib.KeyFileFlags.NONE);
               x_ubuntu_touch = key_file.get_boolean ("Desktop Entry", "X-Ubuntu-Touch");
+              x_is_click = key_file.has_key ("Desktop Entry", "X-Ubuntu-Application-ID");
             }
             catch (Error e)
             {
@@ -1274,7 +1277,8 @@
             }
           }
 
-          if (!x_ubuntu_touch)
+          // click apps are handled by unity-scope-click, so don't show them here either
+          if (!x_ubuntu_touch || x_is_click)
           {
             continue;
           }