|
 |
1e20f1 |
From 3f638b527fc46625d9dc791a07eea573c66f5d3c Mon Sep 17 00:00:00 2001
|
|
|
1e20f1 |
From: Milan Crha <mcrha@redhat.com>
|
|
|
1e20f1 |
Date: Mon, 10 Apr 2017 21:02:53 +0200
|
|
|
1e20f1 |
Subject: Correct two libecal/client tests
|
|
|
1e20f1 |
|
|
|
1e20f1 |
The main loop should be passed always as a user_data, because
|
|
|
1e20f1 |
the function called from the callback expects it and there is
|
|
|
1e20f1 |
no guarantee in which order the callbacks will be called.
|
|
|
1e20f1 |
|
|
|
1e20f1 |
diff --git a/tests/libecal/client/test-cal-client-get-view.c b/tests/libecal/client/test-cal-client-get-view.c
|
|
|
1e20f1 |
index 47514cc..2280646 100644
|
|
|
1e20f1 |
--- a/tests/libecal/client/test-cal-client-get-view.c
|
|
|
1e20f1 |
+++ b/tests/libecal/client/test-cal-client-get-view.c
|
|
|
1e20f1 |
@@ -206,7 +206,7 @@ test_get_view_sync (ETestServerFixture *fixture,
|
|
|
1e20f1 |
g_signal_connect (view, "objects_added", G_CALLBACK (objects_added_cb), fixture->loop);
|
|
|
1e20f1 |
g_signal_connect (view, "objects_modified", G_CALLBACK (objects_modified_cb), fixture->loop);
|
|
|
1e20f1 |
g_signal_connect (view, "objects_removed", G_CALLBACK (objects_removed_cb), fixture->loop);
|
|
|
1e20f1 |
- g_signal_connect (view, "complete", G_CALLBACK (complete_cb), NULL);
|
|
|
1e20f1 |
+ g_signal_connect (view, "complete", G_CALLBACK (complete_cb), fixture->loop);
|
|
|
1e20f1 |
|
|
|
1e20f1 |
e_cal_client_view_set_fields_of_interest (view, NULL, &error);
|
|
|
1e20f1 |
if (error)
|
|
|
1e20f1 |
diff --git a/tests/libecal/client/test-cal-client-revision-view.c b/tests/libecal/client/test-cal-client-revision-view.c
|
|
|
1e20f1 |
index 0e25114..fdb386c 100644
|
|
|
1e20f1 |
--- a/tests/libecal/client/test-cal-client-revision-view.c
|
|
|
1e20f1 |
+++ b/tests/libecal/client/test-cal-client-revision-view.c
|
|
|
1e20f1 |
@@ -250,7 +250,7 @@ test_get_revision_view_sync (ETestServerFixture *fixture,
|
|
|
1e20f1 |
g_signal_connect (view, "objects_added", G_CALLBACK (objects_added_cb), fixture->loop);
|
|
|
1e20f1 |
g_signal_connect (view, "objects_modified", G_CALLBACK (objects_modified_cb), fixture->loop);
|
|
|
1e20f1 |
g_signal_connect (view, "objects_removed", G_CALLBACK (objects_removed_cb), fixture->loop);
|
|
|
1e20f1 |
- g_signal_connect (view, "complete", G_CALLBACK (complete_cb), NULL);
|
|
|
1e20f1 |
+ g_signal_connect (view, "complete", G_CALLBACK (complete_cb), fixture->loop);
|
|
|
1e20f1 |
|
|
|
1e20f1 |
field_list = g_slist_prepend (NULL, (gpointer) "UID");
|
|
|
1e20f1 |
field_list = g_slist_prepend (field_list, (gpointer) "RECURRENCE-ID");
|