libunity

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

workaround-vala-bug
Merge into libunity-7.0

Proposed by Michal Hruby on 2013-05-09

Status:	Merged
Approved by:	Paweł Stołowski on 2013-05-09
Approved revision:	380
Merged at revision:	380
Proposed branch:	lp:~mhr3/libunity/workaround-vala-bug
Merge into:	lp:~unity-team/libunity/libunity-7.0
Diff against target:	57 lines (+25/-2) 2 files modified src/unity-aggregator-scope-private.vala (+2/-2) test/vala/test-scope.vala (+23/-0)
To merge this branch:	bzr merge lp:~mhr3/libunity/workaround-vala-bug
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Paweł Stołowski (community)		2013-05-09	Approve on 2013-05-09
PS Jenkins bot (community)	continuous-integration		Approve on 2013-05-09
Review via email: mp+163126@code.launchpad.net

Commit message

Workaround a bug in Vala

Description of the change

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.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-05-09:

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)

Revision history for this message

Paweł Stołowski (stolowski) wrote on 2013-05-09:

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michal Hruby

Unity Team

@@ 2 / --- src/unity-aggregator-scope-private.vala 2013-05-08 15:09:40 +0000 @@
@@ 3 / +++ src/unity-aggregator-scope-private.vala 2013-05-09 10:31:25 +0000 @@
@@ 4 / @@ -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);
+        }
@@ 19 / --- test/vala/test-scope.vala 2013-04-30 16:21:16 +0000 @@
@@ 20 / +++ test/vala/test-scope.vala 2013-05-09 10:31:25 +0000 @@
@@ 21 / @@ -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",
@@ 30 / @@ -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