1 files changed, 30 insertions, 0 deletions

diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 6c457b14..67a78f50 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -90,6 +90,12 @@ struct GNUNET_GTK_MainLoop
    */
   guint cached_poll_array_size;
 
+  /**
+   * Task we keep around just to keep the event loop running.
+   */
+  GNUNET_SCHEDULER_TaskIdentifier dummy_task;
+
+
 #if WINDOWS
   /**
    * Array to hold pipe handles during a select() call
@@ -148,6 +154,7 @@ struct GNUNET_GTK_MainLoop
 };
 
 
+
 /**
  * Get the configuration.
  *
@@ -170,6 +177,8 @@ void
 GNUNET_GTK_main_loop_quit (struct GNUNET_GTK_MainLoop *ml)
 {
   g_main_loop_quit (ml->gml);
+  GNUNET_SCHEDULER_cancel (ml->dummy_task);
+  ml->dummy_task = GNUNET_SCHEDULER_NO_TASK;
 }
 
 
@@ -221,6 +230,21 @@ resize_cached_poll_array (struct GNUNET_GTK_MainLoop *ml,
 }
 
 
+/**
+ * Dummy task to keep our scheduler running.
+ */
+static void
+keepalive_task (void *cls,
+                const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct GNUNET_GTK_MainLoop *ml = cls;
+
+  ml->dummy_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                 &keepalive_task,
+                                                 ml);
+}
+
+
 #ifndef FD_COPY
 #define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set)))
 #endif
@@ -806,6 +830,12 @@ run_main_loop (void *cls,
   /* start the Gtk event loop */
   GNUNET_assert (TRUE == g_main_context_acquire (ml->gmc));
   GNUNET_SCHEDULER_set_select (&gnunet_gtk_select, ml);
+
+  /* keep Gtk event loop running even if there are no GNUnet tasks */
+  ml->dummy_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                 &keepalive_task,
+                                                 ml);
+
 }