[GNUnet-SVN] r27438 - gnunet-gtk/src/setup

[gnunet]

Author: grothoff
Date: 2013-06-13 13:32:15 +0200 (Thu, 13 Jun 2013)
New Revision: 27438

Modified:
   gnunet-gtk/src/setup/gnunet-setup.c
Log:
-fix setup to use new API correctly

Modified: gnunet-gtk/src/setup/gnunet-setup.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup.c 2013-06-13 06:49:33 UTC (rev 27437)
+++ gnunet-gtk/src/setup/gnunet-setup.c 2013-06-13 11:32:15 UTC (rev 27438)
@@ -429,16 +429,15 @@
  * If the test failed, start the resolver process.
  *
  * @param cls closure, NULL
- * @param tc task context, reason is TIMEOUT if we need to
- *                start the process
+ * @param result GNUNET_YES if the service is running
  */
 static void
 start_resolver (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+               int result)
 {
   char *binary;
 
-  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+  if (GNUNET_YES == result)
     return;
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
   resolver =
@@ -454,19 +453,16 @@
  * If the test failed, start the namestore process.
  *
  * @param cls closure, NULL
- * @param tc task context, reason is TIMEOUT if we need to
- *                start the process
+ * @param result GNUNET_YES if the service is running
  */
 static void
 start_namestore (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
+                int result)
 {
   char *binary;
 
-  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+  if (GNUNET_YES == result)
     return;
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-    return;
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-namestore");
   namestore =
     GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,