summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-12-21 10:14:53 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-02-22 16:29:49 +0100
commitdfc15b2ab4a655943b95100de5df9cb7062e8b6a (patch)
tree9f1f8296680d7079643bdb73d5cab99ff1a6279f
parent3c9d01c88d766297fabffbe72793a6a7a8f0b20c (diff)
downloadtelepathy-glib-dfc15b2ab4a655943b95100de5df9cb7062e8b6a.tar.gz
move ensure_and_observe_cb definition just before using it
-rw-r--r--tests/dbus/account-channel-request.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c
index 107642415..20e05ecca 100644
--- a/tests/dbus/account-channel-request.c
+++ b/tests/dbus/account-channel-request.c
@@ -766,26 +766,6 @@ test_observe_create_success (Test *test,
g_assert_no_error (test->error);
}
-static void
-ensure_and_observe_cb (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
-
-{
- Test *test = user_data;
-
- test->channel = tp_account_channel_request_ensure_and_observe_channel_finish (
- TP_ACCOUNT_CHANNEL_REQUEST (source), result, &test->error);
- if (test->channel == NULL)
- goto out;
-
- g_assert (TP_IS_CHANNEL (test->channel));
- tp_clear_object (&test->channel);
-
-out:
- g_main_loop_quit (test->mainloop);
-}
-
/* ChannelDispatcher.CreateChannel() call fails */
static void
test_observe_create_fail (Test *test,
@@ -865,6 +845,26 @@ test_observe_cr_failed (Test *test,
}
static void
+ensure_and_observe_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+
+{
+ Test *test = user_data;
+
+ test->channel = tp_account_channel_request_ensure_and_observe_channel_finish (
+ TP_ACCOUNT_CHANNEL_REQUEST (source), result, &test->error);
+ if (test->channel == NULL)
+ goto out;
+
+ g_assert (TP_IS_CHANNEL (test->channel));
+ tp_clear_object (&test->channel);
+
+out:
+ g_main_loop_quit (test->mainloop);
+}
+
+static void
test_observe_ensure_success (Test *test,
gconstpointer data G_GNUC_UNUSED)
{