libunity

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

  1. syntax-fixes
  2. Merge into trunk
Proposed by Rico Tzschichholz
Status: Merged
Approved by: Sebastien Bacher
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
Marco Trevisan (Treviño) 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.
Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

Ah I already added dh-python here https://code.launchpad.net/~khurshid-alam/libunity/remove-deprecated-scopes/+merge/362435, but it seems it was already added but did not go through trunk. https://launchpad.net/ubuntu/+source/libunity/7.1.4+18.04.20180209.1-0ubuntu2

lp:~ricotz/libunity/syntax-fixes updated
331. By Sebastien Bacher

releasing package libunity version 7.1.4+18.04.20180209.1-0ubuntu2

332. By Sebastien Bacher

releasing package libunity version 7.1.4+18.04.20180209.1-0ubuntu3

333. By Rico Tzschichholz

Fix wrongly places out-parameters in async methods

334. By Rico Tzschichholz

WIP Fix generic type mismatches

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

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

Revision history for this message
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

Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve
Revision history for this message
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
=== modified file 'protocol/protocol-scope-interface.vala'
--- protocol/protocol-scope-interface.vala 2013-09-24 08:57:39 +0000
+++ protocol/protocol-scope-interface.vala 2019-03-01 17:33:01 +0000
@@ -131,8 +131,8 @@
131 uint channel_type,131 uint channel_type,
132 HashTable<string, Variant> hints,132 HashTable<string, Variant> hints,
133 Cancellable? cancellable = null,133 Cancellable? cancellable = null,
134 out HashTable<string, Variant> out_hints,134 BusName? sender = null,
135 BusName? sender = null) throws IOError;135 out HashTable<string, Variant> out_hints) throws IOError;
136136
137 public abstract async void close_channel (137 public abstract async void close_channel (
138 string channel_id,138 string channel_id,
139139
=== modified file 'protocol/unity-scope-proxy-remote.vala'
--- protocol/unity-scope-proxy-remote.vala 2013-08-01 13:09:05 +0000
+++ protocol/unity-scope-proxy-remote.vala 2019-03-01 17:33:01 +0000
@@ -369,6 +369,7 @@
369 HashTable<string, Variant> out_hints;369 HashTable<string, Variant> out_hints;
370 var channel_id = yield _service.open_channel ((uint) channel_type, hints,370 var channel_id = yield _service.open_channel ((uint) channel_type, hints,
371 cancellable,371 cancellable,
372 null,
372 out out_hints);373 out out_hints);
373 Dee.Peer peer = private_channel ?374 Dee.Peer peer = private_channel ?
374 new Dee.Client (out_hints[CHANNEL_SWARM_NAME_HINT].get_string ()) :375 new Dee.Client (out_hints[CHANNEL_SWARM_NAME_HINT].get_string ()) :
375376
=== modified file 'src/unity-aggregator-scope-private.vala'
--- src/unity-aggregator-scope-private.vala 2014-02-04 14:44:56 +0000
+++ src/unity-aggregator-scope-private.vala 2019-03-01 17:33:01 +0000
@@ -493,13 +493,13 @@
493 }493 }
494 }494 }
495495
496 public void set_categories (List<Category> categories)496 public void set_categories (List<unowned Category> categories)
497 {497 {
498 bool categories_model_empty = categories_model.get_n_rows () == 0;498 bool categories_model_empty = categories_model.get_n_rows () == 0;
499 if (!categories_model_empty)499 if (!categories_model_empty)
500 {500 {
501 // we support only appending new categories, no changes/deletes501 // we support only appending new categories, no changes/deletes
502 unowned List<Category> cats = categories;502 unowned List<unowned Category> cats = categories;
503 uint cats_length = categories.length ();503 uint cats_length = categories.length ();
504 bool data_matches = cats_length >= categories_model.get_n_rows ();504 bool data_matches = cats_length >= categories_model.get_n_rows ();
505505
@@ -541,7 +541,7 @@
541 }541 }
542 }542 }
543543
544 public void set_filters (List<Filter> filters)544 public void set_filters (List<unowned Filter> filters)
545 {545 {
546 filters_model.clear ();546 filters_model.clear ();
547547
@@ -1418,8 +1418,8 @@
1418 uint channel_type,1418 uint channel_type,
1419 HashTable<string, Variant> hints,1419 HashTable<string, Variant> hints,
1420 GLib.Cancellable? cancellable,1420 GLib.Cancellable? cancellable,
1421 out HashTable<string, Variant> out_hints,1421 BusName? sender = null,
1422 BusName? sender = null) throws IOError1422 out HashTable<string, Variant> out_hints) throws IOError
1423 {1423 {
1424 Unity.AggregatorScope aggscope = owner as Unity.AggregatorScope;1424 Unity.AggregatorScope aggscope = owner as Unity.AggregatorScope;
14251425
@@ -1602,4 +1602,4 @@
1602 }1602 }
1603}1603}
16041604
1605} /* namespace Unity.Internal */
1606\ No newline at end of file1605\ No newline at end of file
1606} /* namespace Unity.Internal */
16071607
=== modified file 'src/unity-deprecated-scope-impl.vala'
--- src/unity-deprecated-scope-impl.vala 2013-10-06 11:55:45 +0000
+++ src/unity-deprecated-scope-impl.vala 2019-03-01 17:33:01 +0000
@@ -29,8 +29,8 @@
2929
30private interface DeprecatedScopeDBusImpl : ScopeDBusImpl30private interface DeprecatedScopeDBusImpl : ScopeDBusImpl
31{31{
32 public abstract void set_categories (List<Category> categories);32 public abstract void set_categories (List<unowned Category> categories);
33 public abstract void set_filters (List<Filter> filters);33 public abstract void set_filters (List<unowned Filter> filters);
34}34}
35/*35/*
36 * The private implementation of the Scope. This makes sure that none of the 36 * The private implementation of the Scope. This makes sure that none of the
@@ -151,13 +151,13 @@
151 }151 }
152 }152 }
153153
154 public void set_categories (List<Category> categories)154 public void set_categories (List<unowned Category> categories)
155 {155 {
156 bool categories_model_empty = categories_model.get_n_rows () == 0;156 bool categories_model_empty = categories_model.get_n_rows () == 0;
157 if (!categories_model_empty)157 if (!categories_model_empty)
158 {158 {
159 // we support only appending new categories, no changes/deletes159 // we support only appending new categories, no changes/deletes
160 unowned List<Category> cats = categories;160 unowned List<unowned Category> cats = categories;
161 uint cats_length = categories.length ();161 uint cats_length = categories.length ();
162 bool data_matches = cats_length >= categories_model.get_n_rows ();162 bool data_matches = cats_length >= categories_model.get_n_rows ();
163 163
@@ -199,7 +199,7 @@
199 }199 }
200 }200 }
201201
202 public void set_filters (List<Filter> filters)202 public void set_filters (List<unowned Filter> filters)
203 {203 {
204 filters_model.clear ();204 filters_model.clear ();
205205
@@ -609,8 +609,8 @@
609 uint channel_type,609 uint channel_type,
610 HashTable<string, Variant> hints,610 HashTable<string, Variant> hints,
611 GLib.Cancellable? cancellable,611 GLib.Cancellable? cancellable,
612 out HashTable<string, Variant> out_hints,612 BusName? sender,
613 BusName? sender) throws IOError613 out HashTable<string, Variant> out_hints) throws IOError
614 {614 {
615 ChannelFlags flags = ChannelFlags.from_hints (hints);615 ChannelFlags flags = ChannelFlags.from_hints (hints);
616 var channel = new ScopeChannel ((ChannelType) channel_type);616 var channel = new ScopeChannel ((ChannelType) channel_type);
617617
=== modified file 'src/unity-scope-channel.vala'
--- src/unity-scope-channel.vala 2013-09-24 08:57:39 +0000
+++ src/unity-scope-channel.vala 2019-03-01 17:33:01 +0000
@@ -183,7 +183,7 @@
183 sm.flush_mode = Dee.SharedModelFlushMode.MANUAL;183 sm.flush_mode = Dee.SharedModelFlushMode.MANUAL;
184 sm.set_schema_full (RESULTS_SCHEMA);184 sm.set_schema_full (RESULTS_SCHEMA);
185 sm.set_column_names_full (RESULTS_COLUMN_NAMES);185 sm.set_column_names_full (RESULTS_COLUMN_NAMES);
186 sm.register_vardict_schema (METADATA_COLUMN, vardict_schema);186 sm.register_vardict_schema (METADATA_COLUMN, (HashTable<string, string>) vardict_schema);
187 transfer_model = sm;187 transfer_model = sm;
188 }188 }
189 else189 else
@@ -199,7 +199,7 @@
199199
200 backend_model.set_schema_full (RESULTS_SCHEMA);200 backend_model.set_schema_full (RESULTS_SCHEMA);
201 backend_model.set_column_names_full (RESULTS_COLUMN_NAMES);201 backend_model.set_column_names_full (RESULTS_COLUMN_NAMES);
202 backend_model.register_vardict_schema (METADATA_COLUMN, vardict_schema);202 backend_model.register_vardict_schema (METADATA_COLUMN, (HashTable<string, string>) vardict_schema);
203203
204 set_filter_base (filter_model);204 set_filter_base (filter_model);
205205
206206
=== modified file 'src/unity-scope-dbus-impl.vala'
--- src/unity-scope-dbus-impl.vala 2013-10-06 11:55:45 +0000
+++ src/unity-scope-dbus-impl.vala 2019-03-01 17:33:01 +0000
@@ -232,13 +232,13 @@
232 }232 }
233 }233 }
234234
235 public void set_categories (List<Category> categories)235 public void set_categories (List<unowned Category> categories)
236 {236 {
237 bool categories_model_empty = categories_model.get_n_rows () == 0;237 bool categories_model_empty = categories_model.get_n_rows () == 0;
238 if (!categories_model_empty)238 if (!categories_model_empty)
239 {239 {
240 // we support only appending new categories, no changes/deletes240 // we support only appending new categories, no changes/deletes
241 unowned List<Category> cats = categories;241 unowned List<unowned Category> cats = categories;
242 uint cats_length = categories.length ();242 uint cats_length = categories.length ();
243 bool data_matches = cats_length >= categories_model.get_n_rows ();243 bool data_matches = cats_length >= categories_model.get_n_rows ();
244 244
@@ -277,7 +277,7 @@
277 new Variant.variant (this.categories));277 new Variant.variant (this.categories));
278 }278 }
279279
280 public void set_filters (List<Filter> filters)280 public void set_filters (List<unowned Filter> filters)
281 {281 {
282 filters_model.clear ();282 filters_model.clear ();
283283
@@ -716,8 +716,8 @@
716 uint channel_type,716 uint channel_type,
717 HashTable<string, Variant> hints,717 HashTable<string, Variant> hints,
718 GLib.Cancellable? cancellable,718 GLib.Cancellable? cancellable,
719 out HashTable<string, Variant> out_hints,719 BusName? sender,
720 BusName? sender) throws IOError720 out HashTable<string, Variant> out_hints) throws IOError
721 {721 {
722 ChannelFlags flags = ChannelFlags.from_hints (hints);722 ChannelFlags flags = ChannelFlags.from_hints (hints);
723 var channel = new ScopeChannel ((ChannelType) channel_type);723 var channel = new ScopeChannel ((ChannelType) channel_type);
724724
=== modified file 'src/unity-synchronizer.vala'
--- src/unity-synchronizer.vala 2014-02-04 14:44:56 +0000
+++ src/unity-synchronizer.vala 2019-03-01 17:33:01 +0000
@@ -58,8 +58,8 @@
58 _providers = new HashTable<Dee.Model, unowned Dee.Model> (null, null);58 _providers = new HashTable<Dee.Model, unowned Dee.Model> (null, null);
59 _provider_ids = new HashTable<string, unowned Dee.Model> (str_hash, str_equal);59 _provider_ids = new HashTable<string, unowned Dee.Model> (str_hash, str_equal);
60 _provider_signal_ids = new HashTable<unowned Dee.Model, SignalHandlers?> (null, null);60 _provider_signal_ids = new HashTable<unowned Dee.Model, SignalHandlers?> (null, null);
61 _provider_tags = new HashTable<unowned Dee.Model, unowned Dee.ModelTag> (null, null);61 _provider_tags = new HashTable<unowned Dee.Model, Dee.ModelTag<unowned Dee.ModelIter>> (null, null);
62 _clear_seqnum_tags = new HashTable<unowned Dee.Model, unowned Dee.ModelTag> (null, null);62 _clear_seqnum_tags = new HashTable<unowned Dee.Model, Dee.ModelTag<uint>> (null, null);
63 merge_strategy = this;63 merge_strategy = this;
64 }64 }
6565
@@ -301,4 +301,4 @@
301}301}
302302
303303
304} /* namespace Unity */
305\ No newline at end of file304\ No newline at end of file
305} /* namespace Unity */

Subscribers

People subscribed via source and target branches