Merge lp:~mhr3/libunity/new-tag-api into lp:libunity

[Michal Hruby]

Use new Dee.ModelTag API as proposed in lp:~mhr3/dee/vala-tags

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-libunity/21/console reported an error when processing this lp:~mhr3/libunity/new-tag-api branch.
Not merging it.

=== modified file 'src/unity-lens-tools.vala'
--- src/unity-lens-tools.vala	2011-08-05 16:19:21 +0000
+++ src/unity-lens-tools.vala	2012-01-04 09:27:33 +0000
@@ -129,7 +129,7 @@
   public unowned Dee.Model receiver { get; construct; }
   private Gee.ArrayList<unowned Dee.Model> _providers;
   
-  private Gee.HashMap<unowned Dee.Model, unowned Dee.ModelTag> _provider_tags;
+  private Gee.HashMap<unowned Dee.Model, Dee.ModelTag<unowned Dee.ModelIter>> _provider_tags;
 
   public ResultsSynchronizer (Dee.Model receiver)
   {
@@ -139,7 +139,7 @@
   construct
   {
     _providers = new Gee.ArrayList<unowned Dee.Model> ();
-    _provider_tags = new Gee.HashMap<unowned Dee.Model, unowned Dee.ModelTag> ();
+    _provider_tags = new Gee.HashMap<unowned Dee.Model, Dee.ModelTag<unowned Dee.ModelIter>> ();
   }
 
   public void add_provider (Dee.Model provider, string uid)
@@ -147,7 +147,7 @@
     provider.set_data<string>("uid", "%s:".printf(uid));
 
     _providers.add (provider);
-    _provider_tags.set (provider, provider.register_tag ((d) => {}));
+    _provider_tags[provider] = new Dee.ModelTag<unowned Dee.ModelIter> (provider);
 
     provider.row_added.connect (on_row_added);
     provider.row_removed.connect (on_row_removed);
@@ -165,13 +165,15 @@
                          provider.get_string (iter, 4),
                          provider.get_string (iter, 5),
                          provider.get_string (iter, 6));
-    provider.set_tag (iter, _provider_tags.get (provider), i);
+
+    var tag = _provider_tags[provider];
+    tag [provider, iter] = i;
   }
 
   private void on_row_removed (Dee.Model provider, Dee.ModelIter iter)
   {
-    unowned Dee.ModelTag tag = _provider_tags.get (provider);
-    unowned Dee.ModelIter riter = (Dee.ModelIter)provider.get_tag (iter, tag);
+    var tag = _provider_tags[provider];
+    unowned Dee.ModelIter riter = tag[provider, iter];
 
     if (riter != null)
     {
@@ -185,8 +187,8 @@
 
   private void on_row_changed (Dee.Model provider, Dee.ModelIter iter)
   {
-    unowned Dee.ModelTag tag = _provider_tags.get (provider);
-    unowned Dee.ModelIter riter = (Dee.ModelIter)provider.get_tag (iter, tag);
+    var tag = _provider_tags[provider];
+    unowned Dee.ModelIter riter = tag[provider, iter];
 
     if (riter != null)
     {