1 files changed, 50 insertions, 25 deletions

diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 1c3b4538..0cab7e52 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -47,21 +47,38 @@ static struct GNUNET_GE_Context *ectx;
 static struct GNUNET_GC_Configuration *cfg;
 
 /**
+ * Do the actual update (in event thread).
+ */
+static void *
+updateAppModelSafe (void *arg)
+{
+  GtkWidget *w;
+  GtkListStore *model = arg;
+
+  w =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "applicationList");
+  gtk_tree_view_set_model (GTK_TREE_VIEW (w), GTK_TREE_MODEL (model));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection
+                               (GTK_TREE_VIEW (w)), GTK_SELECTION_NONE);
+  return NULL;
+}
+
+/**
  * cron job that periodically updates the model for the
  * application list.
  */
-static void *
-updateAppModelSafe (void *unused)
+static void
+updateAppModel (void *dummy)
 {
   struct GNUNET_ClientServerConnection *sock;
-  GtkWidget *w;
-  GtkListStore *model;
   GtkTreeIter iter;
   char *apps;
   char *next;
   char *pos;
   char *desc;
-
+  GtkListStore *model;
+  
   model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
   apps = NULL;
   sock = GNUNET_client_connection_create (ectx, cfg);
@@ -102,21 +119,9 @@ updateAppModelSafe (void *unused)
       while (next != NULL);
       GNUNET_free (apps);
     }
-  w =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                          "applicationList");
-  gtk_tree_view_set_model (GTK_TREE_VIEW (w), GTK_TREE_MODEL (model));
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection
-                               (GTK_TREE_VIEW (w)), GTK_SELECTION_NONE);
-  g_object_unref (model);
   GNUNET_client_connection_destroy (sock);
-  return NULL;
-}
-
-static void
-updateAppModel (void *dummy)
-{
-  GNUNET_GTK_save_call (&updateAppModelSafe, NULL);
+  GNUNET_GTK_save_call (&updateAppModelSafe, model);
+  g_object_unref (model);
 }
 
 
@@ -166,7 +171,6 @@ doUpdateMenus (void *arg)
         isLocal = FALSE;
       GNUNET_free (host);
     }
-  updateAppModelSafe (NULL);
   if (ret == 0)
     {
       canStart = 0;
@@ -238,15 +242,24 @@ doUpdateMenus (void *arg)
   return NULL;
 }
 
+/**
+ * Cron job that checks if the daemon is running.
+ */
 static void
 cronCheckDaemon (void *dummy)
 {
+  static int last = -1;
   int ret;
 
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
     ret = 1;
   else
     ret = 0;
+  if (last != ret)
+    {
+      updateAppModel(NULL);
+      last = ret;
+    }
   GNUNET_GTK_save_call (&doUpdateMenus, &ret);
 }
 
@@ -269,7 +282,10 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
   gtk_widget_set_sensitive (launchEntry, FALSE);
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
     {
-      cronCheckDaemon (NULL);
+      GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
+                              &cronCheckDaemon,
+                              15 * GNUNET_CRON_SECONDS,
+                              NULL);
       return;
     }
   else
@@ -309,7 +325,10 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
                   GNUNET_GTK_add_log_entry (_("Launched gnunetd\n"));
                 }
               g_free (fn);
-              cronCheckDaemon (NULL);
+              GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
+                                      &cronCheckDaemon,
+                                      15 * GNUNET_CRON_SECONDS,
+                                      NULL);
               return;
             }
           else
@@ -329,7 +348,10 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
         }
       if (fn != NULL)
         g_free (fn);
-      cronCheckDaemon (NULL);
+      GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
+                              &cronCheckDaemon,
+                              15 * GNUNET_CRON_SECONDS,
+                              NULL);
     }
 }
 
@@ -368,7 +390,10 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
         }
       GNUNET_client_connection_destroy (sock);
     }
-  cronCheckDaemon (NULL);
+  GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
+                          &cronCheckDaemon,
+                          15 * GNUNET_CRON_SECONDS,
+                          NULL);
 }
 
 void
@@ -449,7 +474,7 @@ init_daemon (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
   GNUNET_free (daemon_config);
 
   cron = GNUNET_GTK_get_cron_manager ();
-  GNUNET_cron_add_job (cron, &cronCheckDaemon, 0, 15 * GNUNET_CRON_SECONDS,
+  GNUNET_cron_add_job (cron, &cronCheckDaemon, 2 * GNUNET_CRON_SECONDS, 15 * GNUNET_CRON_SECONDS,
                        NULL);
   GNUNET_cron_add_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES,
                        5 * GNUNET_CRON_MINUTES, NULL);