Merge lp:~ricotz/libunity/syntax-fixes into lp:libunity

Proposed by Rico Tzschichholz on 2019-02-08
Status: Merged
Approved by: Sebastien Bacher on 2019-03-15
Approved revision: 334
Merged at revision: 334
Proposed branch: lp:~ricotz/libunity/syntax-fixes
Merge into: lp:libunity
Diff against target: 208 lines (+26/-25)
7 files modified
protocol/protocol-scope-interface.vala (+2/-2)
protocol/unity-scope-proxy-remote.vala (+1/-0)
src/unity-aggregator-scope-private.vala (+6/-6)
src/unity-deprecated-scope-impl.vala (+7/-7)
src/unity-scope-channel.vala (+2/-2)
src/unity-scope-dbus-impl.vala (+5/-5)
src/unity-synchronizer.vala (+3/-3)
To merge this branch: bzr merge lp:~ricotz/libunity/syntax-fixes
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve on 2019-03-15
Marco Trevisan (TreviƱo) 2019-02-08 Pending
Review via email: mp+362923@code.launchpad.net

Commit message

Those changes are required to build with vala 0.43.x

To post a comment you must log in.
lp:~ricotz/libunity/syntax-fixes updated on 2019-03-01
331. By Sebastien Bacher on 2019-03-01

releasing package libunity version 7.1.4+18.04.20180209.1-0ubuntu2

332. By Sebastien Bacher on 2019-03-01

releasing package libunity version 7.1.4+18.04.20180209.1-0ubuntu3

333. By Rico Tzschichholz on 2019-03-01

Fix wrongly places out-parameters in async methods

334. By Rico Tzschichholz on 2019-03-01

WIP Fix generic type mismatches

Khurshid Alam (khurshid-alam) wrote :

This also require changes in unity-lens-application and unity-scope-home.

Khurshid Alam (khurshid-alam) wrote :

Now it is not compiling on Proposed. I get

dee-CRITICAL **: 19:20:20.959: Unable to set up DBusServer: Error binding to address: Address already in use

Sebastien Bacher (seb128) wrote :

thanks

review: Approve
Khurshid Alam (khurshid-alam) wrote :

Since it may require changes in dee against glib >=2.59.3, I split each diffmodel test with separate address. See https://code.launchpad.net/~khurshid-alam/libunity/glib-2.59.3/+merge/364679

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'protocol/protocol-scope-interface.vala'
2--- protocol/protocol-scope-interface.vala 2013-09-24 08:57:39 +0000
3+++ protocol/protocol-scope-interface.vala 2019-03-01 17:33:01 +0000
4@@ -131,8 +131,8 @@
5 uint channel_type,
6 HashTable<string, Variant> hints,
7 Cancellable? cancellable = null,
8- out HashTable<string, Variant> out_hints,
9- BusName? sender = null) throws IOError;
10+ BusName? sender = null,
11+ out HashTable<string, Variant> out_hints) throws IOError;
12
13 public abstract async void close_channel (
14 string channel_id,
15
16=== modified file 'protocol/unity-scope-proxy-remote.vala'
17--- protocol/unity-scope-proxy-remote.vala 2013-08-01 13:09:05 +0000
18+++ protocol/unity-scope-proxy-remote.vala 2019-03-01 17:33:01 +0000
19@@ -369,6 +369,7 @@
20 HashTable<string, Variant> out_hints;
21 var channel_id = yield _service.open_channel ((uint) channel_type, hints,
22 cancellable,
23+ null,
24 out out_hints);
25 Dee.Peer peer = private_channel ?
26 new Dee.Client (out_hints[CHANNEL_SWARM_NAME_HINT].get_string ()) :
27
28=== modified file 'src/unity-aggregator-scope-private.vala'
29--- src/unity-aggregator-scope-private.vala 2014-02-04 14:44:56 +0000
30+++ src/unity-aggregator-scope-private.vala 2019-03-01 17:33:01 +0000
31@@ -493,13 +493,13 @@
32 }
33 }
34
35- public void set_categories (List<Category> categories)
36+ public void set_categories (List<unowned Category> categories)
37 {
38 bool categories_model_empty = categories_model.get_n_rows () == 0;
39 if (!categories_model_empty)
40 {
41 // we support only appending new categories, no changes/deletes
42- unowned List<Category> cats = categories;
43+ unowned List<unowned Category> cats = categories;
44 uint cats_length = categories.length ();
45 bool data_matches = cats_length >= categories_model.get_n_rows ();
46
47@@ -541,7 +541,7 @@
48 }
49 }
50
51- public void set_filters (List<Filter> filters)
52+ public void set_filters (List<unowned Filter> filters)
53 {
54 filters_model.clear ();
55
56@@ -1418,8 +1418,8 @@
57 uint channel_type,
58 HashTable<string, Variant> hints,
59 GLib.Cancellable? cancellable,
60- out HashTable<string, Variant> out_hints,
61- BusName? sender = null) throws IOError
62+ BusName? sender = null,
63+ out HashTable<string, Variant> out_hints) throws IOError
64 {
65 Unity.AggregatorScope aggscope = owner as Unity.AggregatorScope;
66
67@@ -1602,4 +1602,4 @@
68 }
69 }
70
71-} /* namespace Unity.Internal */
72\ No newline at end of file
73+} /* namespace Unity.Internal */
74
75=== modified file 'src/unity-deprecated-scope-impl.vala'
76--- src/unity-deprecated-scope-impl.vala 2013-10-06 11:55:45 +0000
77+++ src/unity-deprecated-scope-impl.vala 2019-03-01 17:33:01 +0000
78@@ -29,8 +29,8 @@
79
80 private interface DeprecatedScopeDBusImpl : ScopeDBusImpl
81 {
82- public abstract void set_categories (List<Category> categories);
83- public abstract void set_filters (List<Filter> filters);
84+ public abstract void set_categories (List<unowned Category> categories);
85+ public abstract void set_filters (List<unowned Filter> filters);
86 }
87 /*
88 * The private implementation of the Scope. This makes sure that none of the
89@@ -151,13 +151,13 @@
90 }
91 }
92
93- public void set_categories (List<Category> categories)
94+ public void set_categories (List<unowned Category> categories)
95 {
96 bool categories_model_empty = categories_model.get_n_rows () == 0;
97 if (!categories_model_empty)
98 {
99 // we support only appending new categories, no changes/deletes
100- unowned List<Category> cats = categories;
101+ unowned List<unowned Category> cats = categories;
102 uint cats_length = categories.length ();
103 bool data_matches = cats_length >= categories_model.get_n_rows ();
104
105@@ -199,7 +199,7 @@
106 }
107 }
108
109- public void set_filters (List<Filter> filters)
110+ public void set_filters (List<unowned Filter> filters)
111 {
112 filters_model.clear ();
113
114@@ -609,8 +609,8 @@
115 uint channel_type,
116 HashTable<string, Variant> hints,
117 GLib.Cancellable? cancellable,
118- out HashTable<string, Variant> out_hints,
119- BusName? sender) throws IOError
120+ BusName? sender,
121+ out HashTable<string, Variant> out_hints) throws IOError
122 {
123 ChannelFlags flags = ChannelFlags.from_hints (hints);
124 var channel = new ScopeChannel ((ChannelType) channel_type);
125
126=== modified file 'src/unity-scope-channel.vala'
127--- src/unity-scope-channel.vala 2013-09-24 08:57:39 +0000
128+++ src/unity-scope-channel.vala 2019-03-01 17:33:01 +0000
129@@ -183,7 +183,7 @@
130 sm.flush_mode = Dee.SharedModelFlushMode.MANUAL;
131 sm.set_schema_full (RESULTS_SCHEMA);
132 sm.set_column_names_full (RESULTS_COLUMN_NAMES);
133- sm.register_vardict_schema (METADATA_COLUMN, vardict_schema);
134+ sm.register_vardict_schema (METADATA_COLUMN, (HashTable<string, string>) vardict_schema);
135 transfer_model = sm;
136 }
137 else
138@@ -199,7 +199,7 @@
139
140 backend_model.set_schema_full (RESULTS_SCHEMA);
141 backend_model.set_column_names_full (RESULTS_COLUMN_NAMES);
142- backend_model.register_vardict_schema (METADATA_COLUMN, vardict_schema);
143+ backend_model.register_vardict_schema (METADATA_COLUMN, (HashTable<string, string>) vardict_schema);
144
145 set_filter_base (filter_model);
146
147
148=== modified file 'src/unity-scope-dbus-impl.vala'
149--- src/unity-scope-dbus-impl.vala 2013-10-06 11:55:45 +0000
150+++ src/unity-scope-dbus-impl.vala 2019-03-01 17:33:01 +0000
151@@ -232,13 +232,13 @@
152 }
153 }
154
155- public void set_categories (List<Category> categories)
156+ public void set_categories (List<unowned Category> categories)
157 {
158 bool categories_model_empty = categories_model.get_n_rows () == 0;
159 if (!categories_model_empty)
160 {
161 // we support only appending new categories, no changes/deletes
162- unowned List<Category> cats = categories;
163+ unowned List<unowned Category> cats = categories;
164 uint cats_length = categories.length ();
165 bool data_matches = cats_length >= categories_model.get_n_rows ();
166
167@@ -277,7 +277,7 @@
168 new Variant.variant (this.categories));
169 }
170
171- public void set_filters (List<Filter> filters)
172+ public void set_filters (List<unowned Filter> filters)
173 {
174 filters_model.clear ();
175
176@@ -716,8 +716,8 @@
177 uint channel_type,
178 HashTable<string, Variant> hints,
179 GLib.Cancellable? cancellable,
180- out HashTable<string, Variant> out_hints,
181- BusName? sender) throws IOError
182+ BusName? sender,
183+ out HashTable<string, Variant> out_hints) throws IOError
184 {
185 ChannelFlags flags = ChannelFlags.from_hints (hints);
186 var channel = new ScopeChannel ((ChannelType) channel_type);
187
188=== modified file 'src/unity-synchronizer.vala'
189--- src/unity-synchronizer.vala 2014-02-04 14:44:56 +0000
190+++ src/unity-synchronizer.vala 2019-03-01 17:33:01 +0000
191@@ -58,8 +58,8 @@
192 _providers = new HashTable<Dee.Model, unowned Dee.Model> (null, null);
193 _provider_ids = new HashTable<string, unowned Dee.Model> (str_hash, str_equal);
194 _provider_signal_ids = new HashTable<unowned Dee.Model, SignalHandlers?> (null, null);
195- _provider_tags = new HashTable<unowned Dee.Model, unowned Dee.ModelTag> (null, null);
196- _clear_seqnum_tags = new HashTable<unowned Dee.Model, unowned Dee.ModelTag> (null, null);
197+ _provider_tags = new HashTable<unowned Dee.Model, Dee.ModelTag<unowned Dee.ModelIter>> (null, null);
198+ _clear_seqnum_tags = new HashTable<unowned Dee.Model, Dee.ModelTag<uint>> (null, null);
199 merge_strategy = this;
200 }
201
202@@ -301,4 +301,4 @@
203 }
204
205
206-} /* namespace Unity */
207\ No newline at end of file
208+} /* namespace Unity */

Subscribers

People subscribed via source and target branches