[folks/folks-0-1] Adjust to changes introduced with the Vala fix for bgo#629691

[Travis Reitter <treitter src gnome org>]

commit 522683a3c028fda2fda5a2f42c5fcdbea5a5f8d9
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Wed Sep 15 13:22:16 2010 -0700

    Adjust to changes introduced with the Vala fix for bgo#629691

 backends/telepathy/lib/tp-lowlevel.c          |    2 +-
 backends/telepathy/lib/tp-lowlevel.h          |   10 ++++++++++
 backends/telepathy/lib/tpf-persona-store.vala |    3 ++-
 configure.ac                                  |    2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/backends/telepathy/lib/tp-lowlevel.c b/backends/telepathy/lib/tp-lowlevel.c
index e65d81e..f8bb044 100644
--- a/backends/telepathy/lib/tp-lowlevel.c
+++ b/backends/telepathy/lib/tp-lowlevel.c
@@ -478,7 +478,7 @@ iterate_on_channels (TpConnection *conn,
     }
 
     if (callback)
-      callback (channel, cb_obj);
+      callback (channel, NULL, cb_obj);
   }
 }
 
diff --git a/backends/telepathy/lib/tp-lowlevel.h b/backends/telepathy/lib/tp-lowlevel.h
index a00760d..ecac64e 100644
--- a/backends/telepathy/lib/tp-lowlevel.h
+++ b/backends/telepathy/lib/tp-lowlevel.h
@@ -68,7 +68,17 @@ folks_tp_lowlevel_channel_group_change_membership (TpChannel *channel,
     gboolean is_member,
     GError **error);
 
+/**
+ * FolksTpLowlevelNewGroupChannelsCallback:
+ * @channel: (allow-none): the new group #TpChannel
+ * @result: the #GAsyncResult to finish the async call with
+ * @user_data: extra data to pass to the callback
+ *
+ * The callback type for
+ * folks_tp_lowlevel_connection_connect_to_new_group_channels().
+ */
 typedef void (*FolksTpLowlevelNewGroupChannelsCallback) (TpChannel *channel,
+    GAsyncResult *result,
     gpointer user_data);
 
 void
diff --git a/backends/telepathy/lib/tpf-persona-store.vala b/backends/telepathy/lib/tpf-persona-store.vala
index fd11e8c..6f8da33 100644
--- a/backends/telepathy/lib/tpf-persona-store.vala
+++ b/backends/telepathy/lib/tpf-persona-store.vala
@@ -380,7 +380,8 @@ public class Tpf.PersonaStore : Folks.PersonaStore
       this.initialise_favourite_contacts.begin ();
     }
 
-  private void new_group_channels_cb (Channel channel)
+  private void new_group_channels_cb (TelepathyGLib.Channel? channel,
+      GLib.AsyncResult result)
     {
       if (channel == null)
         {
diff --git a/configure.ac b/configure.ac
index d6c8003..4c486cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ AC_SUBST([LT_AGE])
 
 GLIB_REQUIRED=2.24.0
 TP_GLIB_REQUIRED=0.11.15.1
-VALA_REQUIRED=0.9.6
+VALA_REQUIRED=0.9.8.8-95c3a
 
 AM_PROG_VALAC([$VALA_REQUIRED])