Merge lp:~mhr3/unity-scope-home/fix-1231951 into lp:unity-scope-home

Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 170
Merged at revision: 171
Proposed branch: lp:~mhr3/unity-scope-home/fix-1231951
Merge into: lp:unity-scope-home
Diff against target: 39 lines (+6/-2)
3 files modified
configure.ac (+1/-1)
debian/control (+1/-1)
src/scope-definitions-parser.vala (+4/-0)
To merge this branch: bzr merge lp:~mhr3/unity-scope-home/fix-1231951
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Paweł Stołowski (community) Approve
Review via email: mp+188068@code.launchpad.net

Commit message

Set renderer_hint on categories read from the scope files.

Description of the change

Set renderer_hint on categories read from the scope files.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

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 'configure.ac'
2--- configure.ac 2013-09-04 10:28:06 +0000
3+++ configure.ac 2013-09-27 14:33:59 +0000
4@@ -55,7 +55,7 @@
5 # Check for module and library dependancies
6 #####################################################
7 GLIB_REQUIRED=2.27
8-LIBUNITY_REQURED=7.1.1
9+LIBUNITY_REQURED=7.1.2
10 PKG_CHECK_MODULES(HOME_SCOPE,
11 glib-2.0 >= $GLIB_REQUIRED
12 gobject-2.0 >= $GLIB_REQUIRED
13
14=== modified file 'debian/control'
15--- debian/control 2013-09-04 10:28:06 +0000
16+++ debian/control 2013-09-27 14:33:59 +0000
17@@ -8,7 +8,7 @@
18 libdee-dev (>= 1.0.7),
19 libgee-dev,
20 libglib2.0-dev (>= 2.27),
21- libunity-dev (>= 7.1.1),
22+ libunity-dev (>= 7.1.2),
23 valac (>= 0.18.0),
24 libjson-glib-dev,
25 uuid-dev,
26
27=== modified file 'src/scope-definitions-parser.vala'
28--- src/scope-definitions-parser.vala 2013-08-04 13:34:00 +0000
29+++ src/scope-definitions-parser.vala 2013-09-27 14:33:59 +0000
30@@ -96,6 +96,10 @@
31 {
32 category.content_type = CategoryContentType.from_string (definition.content_type);
33 }
34+ if (definition.renderer_hint != null)
35+ {
36+ category.renderer_hint = definition.renderer_hint;
37+ }
38 return category;
39 }
40

Subscribers

People subscribed via source and target branches

to all changes: