1 files changed, 15 insertions, 2 deletions
diff --git a/tests/testplacesview.c b/tests/testplacesview.c
index e258c4405d..bd93224524 100644
--- a/tests/testplacesview.c
+++ b/tests/testplacesview.c
@@ -2,11 +2,23 @@
 #define GTK_COMPILATION
 #include "gtk/gtkplacesviewprivate.h"
 
+static void
+quit_cb (GtkWidget *widget,
+         gpointer   data)
+{
+  gboolean *done = data;
+
+  *done = TRUE;
+
+  g_main_context_wakeup (NULL);
+}
+
 int
 main (int argc, char *argv[])
 {
   GtkWidget *win;
   GtkWidget *view;
+  gboolean done = FALSE;
 
   gtk_init ();
 
@@ -18,9 +30,10 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (win), view);
   gtk_widget_show (win);
 
-  g_signal_connect (win, "destroy", G_CALLBACK (gtk_main_quit), win);
+  g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), &done);
 
-  gtk_main ();
+  while (!done)
+    g_main_context_iteration (NULL, TRUE);
 
   return 0;
 }