unity-lens-applications

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

  1. deduplicate-clicks
  2. Merge into trunk
Proposed by Alejandro J. Cura
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: 369
Merged at revision: 368
Proposed branch: lp:~alecu/unity-lens-applications/deduplicate-clicks
Merge into: lp:unity-lens-applications
Diff against target: 30 lines (+5/-1)
1 file modified
src/daemon.vala (+5/-1)
To merge this branch: bzr merge lp:~alecu/unity-lens-applications/deduplicate-clicks
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
dobey (community) Approve
Review via email: mp+186330@code.launchpad.net

Commit message

Do not include applications from click packages in the results

Description of the change

Do not include applications from click packages in the results

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
dobey (dobey) :
review: Approve
lp:~alecu/unity-lens-applications/deduplicate-clicks updated
369. By Alejandro J. Cura

adding comment requested on review

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

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 2013-08-06 15:10:05 +0000
3+++ src/daemon.vala 2013-09-18 16:09:56 +0000
4@@ -1260,6 +1260,8 @@
5 // XXX: This filtering should be pushed down to the Xapian
6 // index and query builder logic.
7 bool x_ubuntu_touch = false;
8+ bool x_is_click = false;
9+
10 if (full_path != null)
11 {
12 GLib.KeyFile key_file = new GLib.KeyFile ();
13@@ -1267,6 +1269,7 @@
14 {
15 key_file.load_from_file (full_path, GLib.KeyFileFlags.NONE);
16 x_ubuntu_touch = key_file.get_boolean ("Desktop Entry", "X-Ubuntu-Touch");
17+ x_is_click = key_file.has_key ("Desktop Entry", "X-Ubuntu-Application-ID");
18 }
19 catch (Error e)
20 {
21@@ -1274,7 +1277,8 @@
22 }
23 }
24
25- if (!x_ubuntu_touch)
26+ // click apps are handled by unity-scope-click, so don't show them here either
27+ if (!x_ubuntu_touch || x_is_click)
28 {
29 continue;
30 }

Subscribers

People subscribed via source and target branches