Merge lp:~mhr3/libunity/wait-for-model-sync into lp:libunity

[Michal Hruby]

Wait for model synchronization before returning a name in open_channel

Wait for model synchronization before returning a name in open_channel

[lp:~mhr3/libunity/wait-for-model-sync]

238. By Michal Hruby on 2013-06-21

Update symbols file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/libunity-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/37/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good, and the problem with missing icons seems to be gone! +1

review: Approve

=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2013-06-19 04:28:55 +0000
+++ debian/libunity9.symbols	2013-06-21 15:36:29 +0000
@@ -434,6 +434,8 @@
  unity_internal_utils_value_set_async_once@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_internal_utils_value_take_async_mutex@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_internal_utils_value_take_async_once@Base 7.0.0daily13.05.31ubuntu.unity.next
+ unity_internal_utils_wait_for_model_synchronization@Base 0replaceme
+ unity_internal_utils_wait_for_model_synchronization_finish@Base 0replaceme
  unity_launcher_entry_dbus_impl_construct@Base 3.4.6
  unity_launcher_entry_dbus_impl_get_type@Base 3.4.6
  unity_launcher_entry_dbus_impl_new@Base 3.4.6

=== modified file 'src/unity-aggregator-scope-private.vala'
--- src/unity-aggregator-scope-private.vala	2013-05-10 14:36:55 +0000
+++ src/unity-aggregator-scope-private.vala	2013-06-21 15:36:29 +0000
@@ -1798,6 +1798,12 @@
                                              filters_model,
                                              flags | ChannelFlags.NO_FILTERING);
 
+    if (channel.results_model is Dee.SharedModel)
+    {
+      var sm = channel.results_model as Dee.SharedModel;
+      yield Internal.Utils.wait_for_model_synchronization (sm);
+    }
+
     _channels[channel.id] = channel;
     _scopes.register_channel (channel.id, channel.results_model, merge_strategy);
 

=== modified file 'src/unity-deprecated-scope-impl.vala'
--- src/unity-deprecated-scope-impl.vala	2013-06-10 17:56:20 +0000
+++ src/unity-deprecated-scope-impl.vala	2013-06-21 15:36:29 +0000
@@ -636,6 +636,7 @@
       // force AUTOMATIC flushing for the deprecated scopes as they don't
       // expect the ResultSet to have a separate flush() method
       sm.flush_mode = Dee.SharedModelFlushMode.AUTOMATIC;
+      yield Internal.Utils.wait_for_model_synchronization (sm);
     }
 
     _channels[channel.id] = channel;

=== modified file 'src/unity-scope-dbus-impl.vala'
--- src/unity-scope-dbus-impl.vala	2013-06-18 14:41:20 +0000
+++ src/unity-scope-dbus-impl.vala	2013-06-21 15:36:29 +0000
@@ -699,6 +699,12 @@
                                              filters_model,
                                              flags);
 
+    if (channel.results_model is Dee.SharedModel)
+    {
+      var sm = channel.results_model as Dee.SharedModel;
+      yield Internal.Utils.wait_for_model_synchronization (sm);
+    }
+
     _channels[channel.id] = channel;
 
     out_hints = new HashTable<string, Variant> (str_hash, str_equal);

=== modified file 'src/unity-utils.vala'
--- src/unity-utils.vala	2013-04-30 16:21:16 +0000
+++ src/unity-utils.vala	2013-06-21 15:36:29 +0000
@@ -242,6 +242,28 @@
     }
   }
 
+  internal static async void wait_for_model_synchronization (Dee.SharedModel model)
+  {
+    if (model.is_synchronized ()) return;
+
+    var sig_id = model.notify["synchronized"].connect (() =>
+    {
+      if (model.is_synchronized ())
+      {
+        wait_for_model_synchronization.callback ();
+      }
+    });
+
+    if (sig_id == 0)
+    {
+      critical ("Internal error, unable to wait for synchronization");
+      return;
+    }
+
+    yield;
+    SignalHandler.disconnect (model, sig_id);
+  }
+
   internal static Variant hash_table_to_asv (HashTable<string, Variant> hash)
   {
     var b = new VariantBuilder (new VariantType ("a{sv}"));