Merge lp:~stolowski/libunity/progress-source-flat-array into lp:libunity

[Paweł Stołowski]

Serialize progress-source property as an array of strings (each string is a dbus name and path separated with colon), instead of array of tuples.

Serialize progress-source property as an array of strings (each string is a dbus name and path separated with colon), instead of array of tuples.

This is the desired format (just a list of "foo:bar") in the QML bindings (agreed with Saviq), so while we could contcatenate them in the Unity plugin, it's actually easier to just serialize this way; plus, it's easier to extend it with other progress sources in the future (by introducing a schema prefix).

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Tests still passing, looks fine.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-08-14 15:06:11 +0000
+++ configure.ac	2013-08-19 13:46:59 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 7.0.11)
+AC_INIT(libunity, 7.0.12)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-16 10:35:25 +0000
+++ debian/changelog	2013-08-19 13:46:59 +0000
@@ -1,3 +1,9 @@
+libunity (7.0.12+13.10.20130816.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * Serialize progress-source property as an array of strings instead of tuples.
+
+ -- Pawel Stolowski <[e-mail]>  Mon, 19 Aug 2013 14:02:42 +0200
+
 libunity (7.0.11+13.10.20130816.2-0ubuntu1) saucy; urgency=low
 
   [ Michal Hruby ]

=== modified file 'src/unity-aggregator-scope-private.vala'
--- src/unity-aggregator-scope-private.vala	2013-08-06 08:09:15 +0000
+++ src/unity-aggregator-scope-private.vala	2013-08-19 13:46:59 +0000
@@ -38,20 +38,16 @@
     public abstract bool merge_metadata (string scope_id, Dee.Model categories, Dee.Model master_categories);
     
     /*
-      Check if values array contains pstuple. This is needed because
-      vala's 'in' check doesn't work for array of variant tuples.
+      Check if values array contains given progress-source string.
       Note that this is not efficient for many progress source values, but in reality
       we will be dealing with a single source at a time.
      */
-    internal static bool contains_progress_source (Variant[] values, Variant pstuple)
-      requires (pstuple.n_children () == 2)
+    internal static bool contains_progress_source (Variant[] values, Variant psvar)
     {
-      unowned string ps1 = pstuple.get_child_value (0).get_string ();
-      unowned string ps2 = pstuple.get_child_value (1).get_string ();
+      unowned string ps = psvar.get_string ();
       foreach (var v in values)
       {
-        if (v.get_child_value (0).get_string () == ps1 &&
-            v.get_child_value (1).get_string () == ps2)
+        if (v.get_string () == ps)
           return true;
       }
       return false;

=== modified file 'src/unity-category.vala'
--- src/unity-category.vala	2013-08-05 08:23:49 +0000
+++ src/unity-category.vala	2013-08-19 13:46:59 +0000
@@ -151,9 +151,8 @@
 
   internal override void update_hints (HashTable<string, Variant> hints)
   {
-    Variant[] ps = { new Variant.string (dbus_name), new Variant.string (dbus_path) };
-    Variant[] tp = { new Variant.tuple (ps) };
-    hints["progress-source"] = new Variant.array (null, tp);
+    Variant[] ps = { new Variant.string (dbus_name + ":" + dbus_path) };
+    hints["progress-source"] = new Variant.array (null, ps);
   }
 }
 

=== modified file 'test/vala/test-scope.vala'
--- test/vala/test-scope.vala	2013-08-15 15:54:43 +0000
+++ test/vala/test-scope.vala	2013-08-19 13:46:59 +0000
@@ -2194,11 +2194,9 @@
 
       assert (cat_id == "1991");
       assert (psarr != null);
-      assert (psarr.n_children () == 1); // progress-source array contains only one tuple
+      assert (psarr.n_children () == 1); // progress-source array contains only one value
       var ps = psarr.get_child_value (0);
-      assert (ps.n_children () == 2); // tuple has 2 values
-      assert (ps.get_child_value (0).get_string () == "b1");
-      assert (ps.get_child_value (1).get_string () == "b2");
+      assert (ps.get_string () == "b1:b2");
 
       iter = proxy.categories_model.next (iter);
       cat_id = proxy.categories_model.get_string (iter, Unity.Internal.CategoryColumn.ID);
@@ -2207,11 +2205,9 @@
       
       assert (cat_id == "1211");
       assert (psarr != null);
-      assert (psarr.n_children () == 1); // progress-source array contains only one tuple
+      assert (psarr.n_children () == 1); // progress-source array contains only one value
       ps = psarr.get_child_value (0);
-      assert (ps.n_children () == 2); // tuple has 2 values
-      assert (ps.get_child_value (0).get_string () == "a1");
-      assert (ps.get_child_value (1).get_string () == "a2");
+      assert (ps.get_string () == "a1:a2");
     }
   }