Vala doesn't accept GLib.Value as a generic type
authorTravis Reitter <travis.reitter@collabora.co.uk>
Thu, 8 Jul 2010 23:33:33 +0000 (16:33 -0700)
committerTravis Reitter <travis.reitter@collabora.co.uk>
Fri, 9 Jul 2010 00:02:41 +0000 (17:02 -0700)
This works around the problem (until we care about the content of the details
hash).

backends/telepathy/tpf-persona-store.vala

index 2e04bf8..535c517 100644 (file)
@@ -143,11 +143,9 @@ public class Tpf.PersonaStore : Folks.PersonaStore
        */
       if (status != TelepathyGLib.ConnectionStatus.DISCONNECTED)
         {
-          var details = new GLib.HashTable<weak string, weak void*> (
-              str_hash, str_equal);
           this.account_status_changed_cb (
               TelepathyGLib.ConnectionStatus.DISCONNECTED, status, reason, null,
-              details);
+              null);
         }
 
       try
@@ -290,9 +288,11 @@ public class Tpf.PersonaStore : Folks.PersonaStore
         }
     }
 
+  /* FIXME: the second generic type for details is "weak GLib.Value", but Vala
+   * doesn't accept it as a generic type */
   private void account_status_changed_cb (uint old_status, uint new_status,
       uint reason, string? dbus_error_name,
-      GLib.HashTable<weak string, weak GLib.Value>? details)
+      GLib.HashTable<weak string, weak void*>? details)
     {
       if (new_status != TelepathyGLib.ConnectionStatus.CONNECTED)
         return;