make sure frequency goes back down to 15s even if gnunetd does not get started; also, del cron job like that is not nice, possibly not legal with cron under certain circumstances, so avoiding it is a good idea

1 files changed, 6 insertions, 7 deletions

diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 1e0280a6..703e5c4b 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -253,11 +253,6 @@ cronCheckDaemon (void *dummy)
     {
       updateAppModel (NULL);
       last = ret;
-       GNUNET_cron_del_job (cron, &cronCheckDaemon,
-                            1/2 * GNUNET_CRON_SECONDS, NULL);
-       GNUNET_cron_add_job (cron, &cronCheckDaemon,
-                            15 * GNUNET_CRON_SECONDS,
-                            15 * GNUNET_CRON_SECONDS, NULL);
     }
   GNUNET_GTK_save_call (&doUpdateMenus, &ret);
 }
@@ -367,6 +362,7 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
   GtkWidget *killEntry = NULL;
   GtkWidget *statsEntry;
   struct GNUNET_ClientServerConnection *sock;
+  int i;
 
   GNUNET_cron_del_job (cron, &cronCheckDaemon, 15 * GNUNET_CRON_SECONDS,
                        NULL);
@@ -401,8 +397,11 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
         }
       GNUNET_client_connection_destroy (sock);
     }
-  GNUNET_cron_add_job (cron, &cronCheckDaemon, 1 * GNUNET_CRON_SECONDS,
-                       1/2 * GNUNET_CRON_SECONDS, NULL);
+  for (i=0;i<10;i++)
+    GNUNET_cron_add_job (cron, 
+                         &cronCheckDaemon, 
+                         (i+1) * 500 * GNUNET_CRON_MILLISECONDS,
+                         0, NULL);
 }
 
 void