Stop using gtk_main_quit

Stop using gtk_main and gtk_main_quit in tests and
examples. These APIs are on the way out.

1 files changed, 17 insertions, 3 deletions

diff --git a/examples/builder.c b/examples/builder.c
index eb97a7fc90..261a099697 100644
--- a/examples/builder.c
+++ b/examples/builder.c
@@ -8,6 +8,16 @@ print_hello (GtkWidget *widget,
   g_print ("Hello World\n");
 }
 
+static void
+quit_cb (GtkWidget *widget, gpointer data)
+{
+  gboolean *done = data;
+
+  *done = TRUE;
+
+  g_main_context_wakeup (NULL);
+}
+
 int
 main (int   argc,
       char *argv[])
@@ -15,6 +25,7 @@ main (int   argc,
   GtkBuilder *builder;
   GObject *window;
   GObject *button;
+  gboolean done = FALSE;
 
 #ifdef GTK_SRCDIR
   g_chdir (GTK_SRCDIR);
@@ -28,7 +39,7 @@ main (int   argc,
 
   /* Connect signal handlers to the constructed widgets. */
   window = gtk_builder_get_object (builder, "window");
-  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   button = gtk_builder_get_object (builder, "button1");
   g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL);
@@ -37,9 +48,12 @@ main (int   argc,
   g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL);
 
   button = gtk_builder_get_object (builder, "quit");
-  g_signal_connect (button, "clicked", G_CALLBACK (gtk_main_quit), NULL);
+  g_signal_connect (button, "clicked", G_CALLBACK (quit_cb), &done);
+
+  gtk_widget_show (GTK_WIDGET (window));
 
-  gtk_main ();
+  while (!done)
+    g_main_context_iteration (NULL, TRUE);
 
   return 0;
 }