unity-lens-applications

Merge lp:~stolowski/unity-lens-applications/disable-running-apps-scope into lp:unity-lens-applications

  1. disable-running-apps-scope
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: Michal Hruby
Approved revision: 375
Merged at revision: 373
Proposed branch: lp:~stolowski/unity-lens-applications/disable-running-apps-scope
Merge into: lp:unity-lens-applications
Diff against target: 27 lines (+3/-3)
2 files modified
data/Makefile.am (+2/-2)
data/unity-scope-applications.service.in (+1/-1)
To merge this branch: bzr merge lp:~stolowski/unity-lens-applications/disable-running-apps-scope
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+190040@code.launchpad.net

Commit message

Remove running apps scope from the loader params. Mark running apps scope as not visible.

Description of the change

Remove running apps scope from the loader params. Mark running apps scope as not visible.

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

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-lens-applications-ci/54/rebuild

review: Approve (continuous-integration)
lp:~stolowski/unity-lens-applications/disable-running-apps-scope updated
374. By Paweł Stołowski

Don't install running apps .scope file.

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

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-lens-applications-ci/55/rebuild

review: Approve (continuous-integration)
lp:~stolowski/unity-lens-applications/disable-running-apps-scope updated
375. By Paweł Stołowski

Restored visible flag.

Revision history for this message
Michal Hruby (mhr3) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2013-08-27 15:50:39 +0000
3+++ data/Makefile.am 2013-10-09 09:39:35 +0000
4@@ -6,12 +6,12 @@
5 %.scope.in: %.scope.in.in
6 sed -e "s|\@prefix\@|$(prefix)|" -e "s|\@libdir\@|$(libdir)|" $< > $@
7
8-scope_in_in_files = applications.scope.in.in scopes.scope.in.in commands.scope.in.in runningapps.scope.in.in
9+scope_in_in_files = applications.scope.in.in scopes.scope.in.in commands.scope.in.in
10
11 scopedir = $(datadir)/unity/scopes
12 scope_DATA = commands.scope
13 appscopedir = $(scopedir)/applications
14-appscope_DATA = applications.scope scopes.scope runningapps.scope
15+appscope_DATA = applications.scope scopes.scope
16
17 icondir = $(datadir)/unity/themes
18 icon_DATA = applications.png
19
20=== modified file 'data/unity-scope-applications.service.in'
21--- data/unity-scope-applications.service.in 2013-08-27 14:47:16 +0000
22+++ data/unity-scope-applications.service.in 2013-10-09 09:39:35 +0000
23@@ -1,3 +1,3 @@
24 [D-BUS Service]
25 Name=com.canonical.Unity.Scope.Applications
26-Exec=@bindir@/unity-scope-loader applications/applications.scope applications/scopes.scope commands.scope applications/runningapps.scope
27+Exec=@bindir@/unity-scope-loader applications/applications.scope applications/scopes.scope commands.scope

Subscribers

People subscribed via source and target branches