1 files changed, 24 insertions, 4 deletions

diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 60bd1faa..aef8d966 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -191,6 +191,30 @@ GNUNET_GTK_main_loop_quit (struct GNUNET_GTK_MainLoop *ml)
   }
 }
 
+/**
+ * Get the builder from the main window.
+ *
+ * @param ml handle to the main loop
+ * @return NULL on error, otherwise the builder
+ */
+GtkBuilder *
+GNUNET_GTK_main_loop_get_builder (struct GNUNET_GTK_MainLoop *ml)
+{
+  return ml->builder;
+}
+
+int
+GNUNET_GTK_main_loop_build_window (struct GNUNET_GTK_MainLoop *ml, gpointer data)
+{
+  ml->builder = GNUNET_GTK_get_new_builder (ml->main_window_file, data);
+  if (ml->builder == NULL)
+  {
+    GNUNET_GTK_main_loop_quit (ml);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
 
 /**
  * Obtain the name of the configuration file that is being used.
@@ -841,10 +865,6 @@ run_main_loop (void *cls, char *const *args, const char *cfgfile,
     argc++;
   gtk_init (&argc, (char ***) &args);
 
-  /* setup main context */
-  ml->builder = GNUNET_GTK_get_new_builder (ml->main_window_file, NULL);
-  if (ml->builder == NULL)
-    return;
   ml->rs = GNUNET_NETWORK_fdset_create ();
   ml->ws = GNUNET_NETWORK_fdset_create ();
   ml->gml = g_main_loop_new (NULL, TRUE);