Merge lp:~mhr3/libunity/workaround-vala-bug into lp:~unity-team/libunity/libunity-7.0

[Michal Hruby]

Workaround a bug in Vala

Workaround a bug in Vala - a variable with the same name in different blocks of async method generates invalid code.

Added a test that will catch this problem in the future.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:380
http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-ci/78/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-libunity-libunity-7.0-raring-amd64-ci/78

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-libunity-libunity-7.0-ci/78/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'src/unity-aggregator-scope-private.vala'
--- src/unity-aggregator-scope-private.vala	2013-05-08 15:09:40 +0000
+++ src/unity-aggregator-scope-private.vala	2013-05-09 10:31:25 +0000
@@ -1511,10 +1511,10 @@
         HashTable<string, Variant>? last_hints = last_agg_search.get_reply_hints ();
         if (last_hints != null)
         {
-          HashTableIter<string, Variant> iter = HashTableIter<string, Variant> (last_hints);
+          var hints_iter = HashTableIter<string, Variant> (last_hints);
           unowned string key;
           unowned Variant variant;
-          while (iter.next (out key, out variant))
+          while (hints_iter.next (out key, out variant))
             response.insert (key, variant);
         }
 

=== modified file 'test/vala/test-scope.vala'
--- test/vala/test-scope.vala	2013-04-30 16:21:16 +0000
+++ test/vala/test-scope.vala	2013-05-09 10:31:25 +0000
@@ -117,6 +117,8 @@
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_master_global_search));
     Test.add_data_func ("/Unit/MasterScope/MultipleChannels",
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_master_multiple_channels));
+    Test.add_data_func ("/Unit/MasterScope/NoContentHint",
+        Fixture.create<MasterScopeTester> (MasterScopeTester.test_master_no_content));
     Test.add_data_func ("/Unit/MasterScope/Activation",
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_master_activation));
     Test.add_data_func ("/Unit/MasterScope/Sorting/Ascending",
@@ -1087,6 +1089,27 @@
       assert (model.get_n_rows () > 0);
     }
 
+    public void test_master_no_content ()
+    {
+      const string MSG = "There's no content...";
+      const string HINT = Unity.Internal.SEARCH_NO_RESULTS_HINT;
+
+      master_scope.no_content_hint = MSG;
+      results_per_scope = 0;
+
+      // we need channel first
+      Dee.SerializableModel model;
+      var channel_id = ScopeTester.open_channel (proxy, ChannelType.DEFAULT,
+                                                 out model);
+      assert (channel_id != null);
+      var reply_dict = ScopeTester.perform_search (proxy, channel_id, "", null, model);
+
+      assert (search_handler_invocations == child_scopes.length);
+      assert (reply_dict != null);
+      assert (HINT in reply_dict);
+      assert (reply_dict[HINT].get_string () == MSG);
+    }
+
     public void test_master_multiple_channels ()
     {
       // we need channel first