[folks] build fix: Only depend on Gee 0.8.3, since 0.8.4 isn't released yet

[Travis Reitter <treitter src gnome org>]

commit ad77950c7a628399e59ac3d04f07f95bb21f1887
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Tue Feb 12 11:18:13 2013 -0800

    build fix: Only depend on Gee 0.8.3, since 0.8.4 isn't released yet
    
    This can safely be reverted once Gee 0.8.4 is released.

 NEWS                                    |    2 +-
 backends/eds/lib/edsf-persona.vala      |   18 ++++++++++--------
 backends/key-file/kf-persona.vala       |   20 ++++++++++++--------
 backends/telepathy/lib/tpf-persona.vala |    4 ++--
 configure.ac                            |    2 +-
 folks/individual-aggregator.vala        |   10 ++++++----
 folks/individual.vala                   |   22 ++++++++++++++--------
 tests/eds/link-personas.vala            |   20 ++++++++++++--------
 tests/eds/set-im-addresses.vala         |    7 +++++--
 9 files changed, 63 insertions(+), 42 deletions(-)
---
diff --git a/NEWS b/NEWS
index 283d524..a84dfa9 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ Overview of changes from libfolks 0.8.0 to libfolks 0.9.0
 =========================================================
 
 Dependencies:
-â libgee â 0.8.4
+â libgee â 0.8.3
 
 Major changes:
 â Added an ofono backend
diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index 02c68e6..82444ad 100644
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -526,8 +526,8 @@ public class Edsf.Persona : Folks.Persona,
    * doesn't as it's a linkable property, so always has to be loaded anyway. */
   private HashMultiMap<string, ImFieldDetails> _im_addresses =
       new HashMultiMap<string, ImFieldDetails> (null, null,
-          AbstractFieldDetails<string>.hash_static,
-          AbstractFieldDetails<string>.equal_static);
+          (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+          (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
 
   /**
    * { inheritDoc}
@@ -960,8 +960,9 @@ public class Edsf.Persona : Folks.Persona,
       this._local_ids_ro = this._local_ids.read_only_view;
       this._web_service_addresses =
         new HashMultiMap<string, WebServiceFieldDetails> (
-          null, null, AbstractFieldDetails<string>.hash_static,
-          AbstractFieldDetails<string>.equal_static);
+          null, null,
+          (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+          (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
       this._email_addresses_ro = this._email_addresses.read_only_view;
       this._groups = new HashSet<string> ();
       this._groups_ro = this._groups.read_only_view;
@@ -1300,8 +1301,9 @@ public class Edsf.Persona : Folks.Persona,
   private void _update_web_services_addresses ()
     {
       var new_services = new HashMultiMap<string, WebServiceFieldDetails> (
-          null, null, AbstractFieldDetails<string>.hash_static,
-          AbstractFieldDetails<string>.equal_static);
+          null, null,
+          (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+          (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
 
       var services = this.contact.get_attribute ("X-FOLKS-WEB-SERVICES-IDS");
       if (services != null)
@@ -1617,8 +1619,8 @@ public class Edsf.Persona : Folks.Persona,
     {
       var im_eds_map = Persona._get_im_eds_map ();
       var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (null,
-          null, AbstractFieldDetails<string>.hash_static,
-          AbstractFieldDetails<string>.equal_static);
+          null, (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+          (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
 
       foreach (var im_proto in im_eds_map.get_keys ())
         {
diff --git a/backends/key-file/kf-persona.vala b/backends/key-file/kf-persona.vala
index e9f742e..2d4b2eb 100644
--- a/backends/key-file/kf-persona.vala
+++ b/backends/key-file/kf-persona.vala
@@ -145,8 +145,9 @@ public class Folks.Backends.Kf.Persona : Folks.Persona,
       /* Add the new IM addresses to the key file and build a normalised
        * table of them to set as the new property value */
       var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (
-          null, null, AbstractFieldDetails<string>.hash_static,
-          AbstractFieldDetails<string>.equal_static);
+          null, null,
+          (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+          (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
 
       foreach (var protocol2 in im_addresses.get_keys ())
         {
@@ -231,8 +232,9 @@ public class Folks.Backends.Kf.Persona : Folks.Persona,
        * table of them to set as the new property value */
       var new_web_service_addresses =
         new HashMultiMap<string, WebServiceFieldDetails> (
-            null, null, AbstractFieldDetails<string>.hash_static,
-            AbstractFieldDetails<string>.equal_static);
+            null, null,
+            (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+            (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
 
       foreach (var web_service2 in web_service_addresses.get_keys ())
         {
@@ -325,12 +327,14 @@ public class Folks.Backends.Kf.Persona : Folks.Persona,
           this.iid, this.display_id);
 
       this._im_addresses = new HashMultiMap<string, ImFieldDetails> (
-          null, null, AbstractFieldDetails<string>.hash_static,
-          AbstractFieldDetails<string>.equal_static);
+          null, null,
+          (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+          (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
       this._web_service_addresses =
         new HashMultiMap<string, WebServiceFieldDetails> (
-          null, null, AbstractFieldDetails<string>.hash_static,
-          AbstractFieldDetails<string>.equal_static);
+          null, null,
+          (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+          (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
       this._anti_links = new HashSet<string> ();
       this._anti_links_ro = this._anti_links.read_only_view;
 
diff --git a/backends/telepathy/lib/tpf-persona.vala b/backends/telepathy/lib/tpf-persona.vala
index d7fc067..15fa9be 100644
--- a/backends/telepathy/lib/tpf-persona.vala
+++ b/backends/telepathy/lib/tpf-persona.vala
@@ -389,8 +389,8 @@ public class Tpf.Persona : Folks.Persona,
    * doesn't as it's a linkable property, so always has to be loaded anyway. */
   private HashMultiMap<string, ImFieldDetails> _im_addresses =
       new HashMultiMap<string, ImFieldDetails> (null, null,
-          AbstractFieldDetails<string>.hash_static,
-          AbstractFieldDetails<string>.equal_static);
+          (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+          (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
 
   /**
    * A mapping of IM protocol to an (unordered) set of IM addresses.
diff --git a/configure.ac b/configure.ac
index c3fdb2a..39e22b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,7 @@ TRACKER_SPARQL_REQUIRED=0.13.1
 EBOOK_REQUIRED=3.5.3
 EDATASERVER_REQUIRED=3.5.3.1
 ZEITGEIST_REQUIRED=0.3.14
-GEE_REQUIRED=0.8.4
+GEE_REQUIRED=0.8.3
 
 AC_SUBST([TRACKER_SPARQL_MAJOR])
 
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index 53bcbf7..b168863 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -1983,12 +1983,14 @@ public class Folks.IndividualAggregator : Object
     {
       /* ``protocols_addrs_set`` will be passed to the new Kf.Persona */
       var protocols_addrs_set = new HashMultiMap<string, ImFieldDetails> (
-            null, null, AbstractFieldDetails<string>.hash_static,
-            AbstractFieldDetails<string>.equal_static);
+            null, null,
+            (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+            (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
       var web_service_addrs_set =
         new HashMultiMap<string, WebServiceFieldDetails> (
-            null, null, AbstractFieldDetails<string>.hash_static,
-            AbstractFieldDetails<string>.equal_static);
+            null, null,
+            (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+            (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
 
       /* List of local_ids */
       var local_ids = new Gee.HashSet<string> ();
diff --git a/folks/individual.vala b/folks/individual.vala
index d3fafed..7fb026d 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -1721,14 +1721,16 @@ public class Folks.Individual : Object,
           () =>
             {
               this._im_addresses = new HashMultiMap<string, ImFieldDetails> (
-                  null, null, AbstractFieldDetails<string>.hash_static,
-                  AbstractFieldDetails<string>.equal_static);
+                  null, null,
+                  (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+                  (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
             },
           () =>
             {
               var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (
-                  null, null, AbstractFieldDetails<string>.hash_static,
-                  AbstractFieldDetails<string>.equal_static);
+                  null, null,
+                  (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+                  (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
 
               foreach (var persona in this._persona_set)
                 {
@@ -1770,15 +1772,19 @@ public class Folks.Individual : Object,
             {
               this._web_service_addresses =
                   new HashMultiMap<string, WebServiceFieldDetails> (null, null,
-                      AbstractFieldDetails<string>.hash_static,
-                      AbstractFieldDetails<string>.equal_static);
+                      (Gee.HashDataFunc)
+                          AbstractFieldDetails<string>.hash_static,
+                      (Gee.EqualDataFunc)
+                          AbstractFieldDetails<string>.equal_static);
             },
           () =>
             {
               var new_web_service_addresses =
                   new HashMultiMap<string, WebServiceFieldDetails> (null, null,
-                      AbstractFieldDetails<string>.hash_static,
-                      AbstractFieldDetails<string>.equal_static);
+                      (Gee.HashDataFunc)
+                          AbstractFieldDetails<string>.hash_static,
+                      (Gee.EqualDataFunc)
+                          AbstractFieldDetails<string>.equal_static);
 
               foreach (var persona in this._persona_set)
                 {
diff --git a/tests/eds/link-personas.vala b/tests/eds/link-personas.vala
index 6b4443a..3dbb2cb 100644
--- a/tests/eds/link-personas.vala
+++ b/tests/eds/link-personas.vala
@@ -224,8 +224,9 @@ public class LinkPersonasTests : Folks.TestCase
         {
           v1 = Value (typeof (MultiMap));
           var im_addrs1 = new HashMultiMap<string, ImFieldDetails> (
-              null, null, AbstractFieldDetails<string>.hash_static,
-              AbstractFieldDetails<string>.equal_static);
+              null, null,
+              (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+              (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
           if (this._linking_method == LinkingMethod.EMAIL_AS_IM_ADDRESS)
             im_addrs1.set ("jabber",
                 new ImFieldDetails (this._auto_linkable_email));
@@ -238,8 +239,9 @@ public class LinkPersonasTests : Folks.TestCase
         {
           v1 = Value (typeof (MultiMap));
           var wsa1 = new HashMultiMap<string, WebServiceFieldDetails> (
-              null, null, AbstractFieldDetails<string>.hash_static,
-              AbstractFieldDetails<string>.equal_static);
+              null, null,
+              (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+              (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
           wsa1.set ("twitter", new WebServiceFieldDetails (this._im_address_1));
           v1.set_object (wsa1);
           details1.insert (wsk, (owned) v1);
@@ -257,8 +259,9 @@ public class LinkPersonasTests : Folks.TestCase
         {
           v3 = Value (typeof (MultiMap));
           var im_addrs2 = new HashMultiMap<string, ImFieldDetails> (
-              null, null, AbstractFieldDetails<string>.hash_static,
-              AbstractFieldDetails<string>.equal_static);
+              null, null,
+              (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+              (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
           im_addrs2.set ("yahoo", new ImFieldDetails (this._im_address_2));
           v3.set_object (im_addrs2);
           details2.insert ("im-addresses", (owned) v3);
@@ -267,8 +270,9 @@ public class LinkPersonasTests : Folks.TestCase
         {
           v3 = Value (typeof (MultiMap));
           var wsa2 = new HashMultiMap<string, WebServiceFieldDetails> (
-              null, null, AbstractFieldDetails<string>.hash_static,
-              AbstractFieldDetails<string>.equal_static);
+              null, null,
+              (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+              (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
           wsa2.set ("lastfm", new WebServiceFieldDetails (this._im_address_2));
           v3.set_object (wsa2);
           details2.insert (wsk, (owned) v3);
diff --git a/tests/eds/set-im-addresses.vala b/tests/eds/set-im-addresses.vala
index 3808e17..db0736b 100644
--- a/tests/eds/set-im-addresses.vala
+++ b/tests/eds/set-im-addresses.vala
@@ -126,8 +126,11 @@ public class SetIMAddressesTests : Folks.TestCase
               foreach (var p in i.personas)
                 {
                   var im_addrs = new HashMultiMap<string, ImFieldDetails> (
-                      null, null, AbstractFieldDetails<string>.hash_static,
-                      AbstractFieldDetails<string>.equal_static);
+                      null, null,
+                      (Gee.HashDataFunc)
+                          AbstractFieldDetails<string>.hash_static,
+                      (Gee.EqualDataFunc)
+                          AbstractFieldDetails<string>.equal_static);
                   im_addrs.set ("jabber",
                       new ImFieldDetails ("bernie example org"));
                   ((ImDetails) p).im_addresses = im_addrs;