Merge lp:~jamesh/libunity/metadata-form-factor into lp:libunity

[James Henstridge]

Expose the "form-factor" search hint through the Unity.SearchMetadata class.

Expose the "form-factor" search hint through the Unity.SearchMetadata class. This is required for scopes using the AbstractScope API to check this hint (since they don't get direct access to the hints dictionary like DeprecatedScope does).

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Looks good. +1

review: Approve

=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2013-07-04 20:21:07 +0000
+++ debian/libunity9.symbols	2013-07-19 03:22:25 +0000
@@ -602,6 +602,7 @@
  unity_search_context_get_type@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_search_metadata_construct@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_search_metadata_create@Base 7.0.0daily13.05.31ubuntu.unity.next
+ unity_search_metadata_get_form_factor@Base 0replaceme
  unity_search_metadata_get_locale@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_search_metadata_get_type@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_search_metadata_new@Base 7.0.0daily13.05.31ubuntu.unity.next

=== modified file 'src/unity-scope-interface.vala'
--- src/unity-scope-interface.vala	2013-07-03 23:14:43 +0000
+++ src/unity-scope-interface.vala	2013-07-19 03:22:25 +0000
@@ -328,6 +328,17 @@
     }
   }
 
+  public string? form_factor
+  {
+    get
+    {
+      if (all_metadata == null) return null;
+      Variant form_factor_v = all_metadata["form-factor"];
+      if (form_factor_v == null) return null;
+      return form_factor_v.get_string ();
+    }
+  }
+
   public static SearchMetadata create (HashTable<string, Variant>? metadata)
   {
     var m = new SearchMetadata ();

=== modified file 'test/vala/test-scope.vala'
--- test/vala/test-scope.vala	2013-07-17 15:32:25 +0000
+++ test/vala/test-scope.vala	2013-07-19 03:22:25 +0000
@@ -71,6 +71,9 @@
         Fixture.create<ScopeTester> (ScopeTester.test_scope_preview_action));
     Test.add_data_func ("/Unit/Scope/Filters",
         Fixture.create<ScopeTester> (ScopeTester.test_scope_filters));
+    Test.add_data_func ("/Unit/Scope/FormFactor",
+        Fixture.create<ScopeTester> (ScopeTester.test_scope_form_factor));
+
 
     Test.add_data_func ("/Unit/SimpleScope/Search",
         Fixture.create<SimpleScopeTester> (SimpleScopeTester.test_simple_search));
@@ -890,6 +893,25 @@
       assert (reply_dict != null);
       assert (got_search_signal);
     }
+
+    public void test_scope_form_factor ()
+    {
+      // we need channel first
+      var channel_id = open_channel (proxy, ChannelType.DEFAULT, null);
+      assert (channel_id != null);
+
+      string form_factor = null;
+
+      // form_factor is taken from the hints dictionary
+      var hints = new HashTable<string, Variant?> (str_hash, str_equal);
+      hints["form-factor"] = new Variant.string ("phone");
+      ScopeTester.perform_search (proxy, channel_id, "", hints,
+                                  null, scope, (search) =>
+      {
+        form_factor = search.search_metadata.form_factor;
+      });
+      assert (form_factor == "phone");
+    }
   }
 
   class SimpleScopeTester: Object, Fixture