unity-lens-applications

Merge lp:~mhr3/unity-lens-applications/master-scope into lp:unity-lens-applications

  1. master-scope
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Michal Hruby
Approved revision: 352
Merged at revision: 351
Proposed branch: lp:~mhr3/unity-lens-applications/master-scope
Merge into: lp:unity-lens-applications
Diff against target: 51 lines (+9/-7)
2 files modified
Makefile.am (+8/-5)
src/daemon.vala (+1/-2)
To merge this branch: bzr merge lp:~mhr3/unity-lens-applications/master-scope
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michal Hruby (community) Approve
Review via email: mp+175686@code.launchpad.net

Commit message

Turn the main applications scope into a sub-scope, to allow other scopes to provide results of this type.

Description of the change

Turn the main applications scope into a sub-scope, to allow other scopes to provide results of this type.

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

Quick fix for https://code.launchpad.net/~jamesh/unity-lens-applications/master-scope/+merge/175527 therefore self-approving.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-05-16 11:37:05 +0000
3+++ Makefile.am 2013-07-18 21:19:36 +0000
4@@ -5,8 +5,11 @@
5 # Install the applications.lens file
6 #
7 scope_in_files = applications.scope.in commands.scope.in
8+
9 scopedir = $(datadir)/unity/scopes
10-scope_DATA = $(scope_in_files:.scope.in=.scope)
11+scope_DATA = commands.scope
12+appscopedir = $(scopedir)/applications
13+appscope_DATA = applications.scope
14
15 icondir = $(datadir)/unity/themes
16 icon_DATA = applications.png
17@@ -18,16 +21,16 @@
18 # ChangeLog file created at distcheck time
19 dist-hook:
20 @if test -d "$(srcdir)/.bzr"; \
21- then \
22- echo Creating ChangeLog && \
23+ then \
24+ echo Creating ChangeLog && \
25 ( cd "$(top_srcdir)" && \
26- echo '# Generated by Makefile. Do not edit.'; echo; \
27+ echo '# Generated by Makefile. Do not edit.'; echo; \
28 $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
29 && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
30 || (rm -f ChangeLog.tmp; \
31 echo Failed to generate ChangeLog >&2 ); \
32 else \
33- echo Failed to generate ChangeLog: not a branch >&2; \
34+ echo Failed to generate ChangeLog: not a branch >&2; \
35 fi
36
37 EXTRA_DIST = \
38
39=== modified file 'src/daemon.vala'
40--- src/daemon.vala 2013-07-01 12:17:01 +0000
41+++ src/daemon.vala 2013-07-18 21:19:36 +0000
42@@ -336,8 +336,7 @@
43 categories.add (cat);
44
45 cat = new Unity.Category ("more", _("More suggestions"),
46- new FileIcon (icon_dir.get_child ("group-treat-yourself.svg")),
47- Unity.CategoryRenderer.FLOW);
48+ new FileIcon (icon_dir.get_child ("group-treat-yourself.svg")));
49 categories.add (cat);
50
51 scope.categories = categories;

Subscribers

People subscribed via source and target branches