[next] telepathy-glib: test-cli-group: use a proper callback

Simon McVittie smcv at kemper.freedesktop.org
Wed Sep 17 05:22:52 PDT 2014


Module: telepathy-glib
Branch: next
Commit: c7da17f6d08eee0d308eb12e5755da0543371a3d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=c7da17f6d08eee0d308eb12e5755da0543371a3d

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu May 29 15:11:35 2014 +0200

test-cli-group: use a proper callback

Makes Tartan happier.

---

 tests/dbus/cli-group.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/dbus/cli-group.c b/tests/dbus/cli-group.c
index 609e756..f2dcc1b 100644
--- a/tests/dbus/cli-group.c
+++ b/tests/dbus/cli-group.c
@@ -210,13 +210,26 @@ check_invalidated_unknown_error_cb (TpProxy *proxy,
 }
 
 static void
+quit_cb (TpChannel *chan_,
+    GPtrArray *added,
+    GPtrArray *removed,
+    GPtrArray *local_pending,
+    GPtrArray *remote_pending,
+    TpContact *actor,
+    GVariant *details,
+    GMainLoop *loop)
+{
+  g_main_loop_quit (loop);
+}
+
+static void
 run_until_members_changed (TpChannel *channel)
 {
   GMainLoop *loop = g_main_loop_new (NULL, FALSE);
   gulong id;
 
-  id = g_signal_connect_swapped (channel, "group-members-changed",
-      G_CALLBACK (g_main_loop_quit), loop);
+  id = g_signal_connect (channel, "group-members-changed",
+      G_CALLBACK (quit_cb), loop);
 
   g_main_loop_run (loop);
 



More information about the telepathy-commits mailing list