aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/daemon/daemon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/daemon/daemon.c')
-rw-r--r--src/plugins/daemon/daemon.c35
1 files changed, 15 insertions, 20 deletions
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 0cab7e52..a120b03c 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -78,7 +78,7 @@ updateAppModel (void *dummy)
78 char *pos; 78 char *pos;
79 char *desc; 79 char *desc;
80 GtkListStore *model; 80 GtkListStore *model;
81 81
82 model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); 82 model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
83 apps = NULL; 83 apps = NULL;
84 sock = GNUNET_client_connection_create (ectx, cfg); 84 sock = GNUNET_client_connection_create (ectx, cfg);
@@ -257,7 +257,7 @@ cronCheckDaemon (void *dummy)
257 ret = 0; 257 ret = 0;
258 if (last != ret) 258 if (last != ret)
259 { 259 {
260 updateAppModel(NULL); 260 updateAppModel (NULL);
261 last = ret; 261 last = ret;
262 } 262 }
263 GNUNET_GTK_save_call (&doUpdateMenus, &ret); 263 GNUNET_GTK_save_call (&doUpdateMenus, &ret);
@@ -282,10 +282,9 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
282 gtk_widget_set_sensitive (launchEntry, FALSE); 282 gtk_widget_set_sensitive (launchEntry, FALSE);
283 if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg)) 283 if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
284 { 284 {
285 GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (), 285 GNUNET_cron_advance_job (GNUNET_GTK_get_cron_manager (),
286 &cronCheckDaemon, 286 &cronCheckDaemon,
287 15 * GNUNET_CRON_SECONDS, 287 15 * GNUNET_CRON_SECONDS, NULL);
288 NULL);
289 return; 288 return;
290 } 289 }
291 else 290 else
@@ -325,10 +324,9 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
325 GNUNET_GTK_add_log_entry (_("Launched gnunetd\n")); 324 GNUNET_GTK_add_log_entry (_("Launched gnunetd\n"));
326 } 325 }
327 g_free (fn); 326 g_free (fn);
328 GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (), 327 GNUNET_cron_advance_job (GNUNET_GTK_get_cron_manager (),
329 &cronCheckDaemon, 328 &cronCheckDaemon,
330 15 * GNUNET_CRON_SECONDS, 329 15 * GNUNET_CRON_SECONDS, NULL);
331 NULL);
332 return; 330 return;
333 } 331 }
334 else 332 else
@@ -348,10 +346,9 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
348 } 346 }
349 if (fn != NULL) 347 if (fn != NULL)
350 g_free (fn); 348 g_free (fn);
351 GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (), 349 GNUNET_cron_advance_job (GNUNET_GTK_get_cron_manager (),
352 &cronCheckDaemon, 350 &cronCheckDaemon,
353 15 * GNUNET_CRON_SECONDS, 351 15 * GNUNET_CRON_SECONDS, NULL);
354 NULL);
355 } 352 }
356} 353}
357 354
@@ -390,10 +387,8 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
390 } 387 }
391 GNUNET_client_connection_destroy (sock); 388 GNUNET_client_connection_destroy (sock);
392 } 389 }
393 GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (), 390 GNUNET_cron_advance_job (GNUNET_GTK_get_cron_manager (),
394 &cronCheckDaemon, 391 &cronCheckDaemon, 15 * GNUNET_CRON_SECONDS, NULL);
395 15 * GNUNET_CRON_SECONDS,
396 NULL);
397} 392}
398 393
399void 394void
@@ -474,8 +469,8 @@ init_daemon (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
474 GNUNET_free (daemon_config); 469 GNUNET_free (daemon_config);
475 470
476 cron = GNUNET_GTK_get_cron_manager (); 471 cron = GNUNET_GTK_get_cron_manager ();
477 GNUNET_cron_add_job (cron, &cronCheckDaemon, 2 * GNUNET_CRON_SECONDS, 15 * GNUNET_CRON_SECONDS, 472 GNUNET_cron_add_job (cron, &cronCheckDaemon, 2 * GNUNET_CRON_SECONDS,
478 NULL); 473 15 * GNUNET_CRON_SECONDS, NULL);
479 GNUNET_cron_add_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES, 474 GNUNET_cron_add_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES,
480 5 * GNUNET_CRON_MINUTES, NULL); 475 5 * GNUNET_CRON_MINUTES, NULL);
481} 476}