From 90b016ef73d2acc1b176a173add08f2cb0ddfc53 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 26 Dec 2017 23:15:30 -0500
Subject: [PATCH] Fix the textbuffer test

The test was assuming that gtk_text_buffer_paste_clipboard is
synchronous, which is no longer the case.
---
 testsuite/gtk/textbuffer.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/testsuite/gtk/textbuffer.c b/testsuite/gtk/textbuffer.c
index f0817bbbf0..d4bb416a2b 100644
--- a/testsuite/gtk/textbuffer.c
+++ b/testsuite/gtk/textbuffer.c
@@ -1362,6 +1362,19 @@ check_buffer_contents (GtkTextBuffer *buffer,
   g_assert_cmpstr (buffer_contents, ==, contents);
 }
 
+static void
+wait_for_changed (GtkTextBuffer *buffer)
+{
+  GMainLoop *loop;
+  gulong id;
+
+  loop = g_main_loop_new (NULL, FALSE);
+  id = g_signal_connect_swapped (buffer, "changed", G_CALLBACK (g_main_loop_quit), loop);
+  g_main_loop_run (loop);
+  g_signal_handler_disconnect (buffer, id);
+  g_main_loop_unref (loop);
+}
+
 static void
 test_clipboard (void)
 {
@@ -1386,6 +1399,8 @@ test_clipboard (void)
 
   gtk_text_buffer_get_end_iter (buffer, &end);
   gtk_text_buffer_paste_clipboard (buffer, clipboard, &end, TRUE);
+  wait_for_changed (buffer);
+
   check_buffer_contents (buffer, "defabc");
 
   /* Simple copy & paste */
@@ -1396,6 +1411,8 @@ test_clipboard (void)
 
   gtk_text_buffer_get_start_iter (buffer, &start);
   gtk_text_buffer_paste_clipboard (buffer, clipboard, &start, TRUE);
+  wait_for_changed (buffer);
+
   check_buffer_contents (buffer, "abcdefabc");
 
   /* Replace the selection when pasting */
@@ -1410,6 +1427,8 @@ test_clipboard (void)
   gtk_text_buffer_get_end_iter (buffer, &end);
   gtk_text_buffer_select_range (buffer, &start, &end);
   gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+  wait_for_changed (buffer);
+
   check_buffer_contents (buffer, "abcabc");
 
   /* Copy & paste text with tags.
@@ -1428,6 +1447,8 @@ test_clipboard (void)
   gtk_text_buffer_select_range (buffer, &start, &end);
   gtk_text_buffer_copy_clipboard (buffer, clipboard);
   gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+  wait_for_changed (buffer);
+
   check_buffer_contents (buffer, "abcdef");
 
   gtk_text_buffer_get_iter_at_offset (buffer, &start, 3);