Merge lp:~mhr3/unity-scope-home/protocol-scope-discovery into lp:unity-scope-home

Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 160
Merged at revision: 161
Proposed branch: lp:~mhr3/unity-scope-home/protocol-scope-discovery
Merge into: lp:unity-scope-home
Diff against target: 83 lines (+10/-7)
5 files modified
configure.ac (+1/-1)
debian/control (+1/-1)
src/scope-registry.vala (+3/-3)
src/scope.vala (+1/-1)
tests/unit/test-home-scope.vala (+4/-1)
To merge this branch: bzr merge lp:~mhr3/unity-scope-home/protocol-scope-discovery
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+183880@code.launchpad.net

Commit message

Use latest protocol library to discover scopes, fixes support for OEM customizations.

Description of the change

Use latest protocol library to discover scopes, this will fix support for OEM customizations.

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
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

Looks good. +1

review: Approve

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-08-29 11:29:05 +0000
3+++ configure.ac 2013-09-04 13:58:00 +0000
4@@ -55,7 +55,7 @@
5 # Check for module and library dependancies
6 #####################################################
7 GLIB_REQUIRED=2.27
8-LIBUNITY_REQURED=7.1.0
9+LIBUNITY_REQURED=7.1.1
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-08-27 14:28:33 +0000
16+++ debian/control 2013-09-04 13:58:00 +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.0),
22+ libunity-dev (>= 7.1.1),
23 valac (>= 0.18.0),
24 libjson-glib-dev,
25 uuid-dev,
26
27=== modified file 'src/scope-registry.vala'
28--- src/scope-registry.vala 2013-04-17 11:14:59 +0000
29+++ src/scope-registry.vala 2013-09-04 13:58:00 +0000
30@@ -74,14 +74,14 @@
31 return subscope_to_master.lookup (subscope_id);
32 }
33
34- public async void find_scopes (string scopes_root_path)
35+ public async void find_scopes ()
36 {
37- debug ("Searching for scopes in %s", scopes_root_path);
38+ debug ("Searching for scopes");
39
40 Protocol.ScopeRegistry tmp_registry = null;
41 try
42 {
43- tmp_registry = yield Protocol.ScopeRegistry.find_scopes (scopes_root_path);
44+ tmp_registry = yield Protocol.ScopeRegistry.find_scopes (null);
45 debug ("Scope discovery done");
46 scopes_ready = true;
47 }
48
49=== modified file 'src/scope.vala'
50--- src/scope.vala 2013-08-30 11:40:59 +0000
51+++ src/scope.vala 2013-09-04 13:58:00 +0000
52@@ -133,7 +133,7 @@
53 var ml = new MainLoop ();
54
55 var reg = ScopeRegistry.instance ();
56- reg.find_scopes.begin (Config.PKGDATADIR + "/scopes", (obj, res) =>
57+ reg.find_scopes.begin ((obj, res) =>
58 {
59 reg.find_scopes.end (res);
60 ml.quit ();
61
62=== modified file 'tests/unit/test-home-scope.vala'
63--- tests/unit/test-home-scope.vala 2013-08-28 11:21:56 +0000
64+++ tests/unit/test-home-scope.vala 2013-09-04 13:58:00 +0000
65@@ -71,6 +71,9 @@
66 Environment.set_variable ("XDG_DATA_DIRS",
67 "%s:%s".printf (Config.TESTDATADIR, xdg_data_dirs),
68 true);
69+ Environment.set_variable ("LIBUNITY_SCOPE_DIRECTORIES",
70+ "%s/unity/scopes".printf (Config.TESTDATADIR),
71+ true);
72 kw = new KeywordSearch ();
73
74 Test.init (ref args);
75@@ -128,7 +131,7 @@
76 Test.add_data_func ("/Unit/MarkupCleaner/NumericEntitiesArePreserved", Fixture.create<MarkupCleanerTester> (MarkupCleanerTester.test_num_entities_are_preserved));
77
78 var ml = new MainLoop ();
79- ScopeRegistry.instance ().find_scopes.begin (Config.PKGDATADIR + "/scopes", (obj, res) =>
80+ ScopeRegistry.instance ().find_scopes.begin ((obj, res) =>
81 {
82 ScopeRegistry.instance ().find_scopes.end (res);
83 kw.rebuild ();

Subscribers

People subscribed via source and target branches

to all changes: