9 files changed, 27 insertions, 27 deletions

diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index 20a564db..3aab6f34 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -63,7 +63,7 @@ struct SearchLookup
   /**
    * Task to trigger timeout.
    */
-  GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+  struct GNUNET_SCHEDULER_Task * timeout_task;
 
   /**
    * Desired anonymity level.
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index cf481166..4944168d 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -64,10 +64,10 @@ abort_search_lookup (struct SearchLookup *sl)
   GNUNET_CONTAINER_DLL_remove (main_ctx->sl_head,
                                main_ctx->sl_tail,
                                sl);
-  if (GNUNET_SCHEDULER_NO_TASK != sl->timeout_task)
+  if (NULL != sl->timeout_task)
   {
     GNUNET_SCHEDULER_cancel (sl->timeout_task);
-    sl->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    sl->timeout_task = NULL;
   }
   if (NULL != sl->gns)
   {
@@ -92,7 +92,7 @@ timeout_search_lookup (void *cls,
 {
   struct SearchLookup *sl = cls;
 
-  sl->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  sl->timeout_task = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               _("Failed to resolve namespace in time\n"));
   abort_search_lookup (sl);
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 84564a91..2e628969 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -384,7 +384,7 @@ struct AddDirClientContext
   /**
    * Task scheduled to stop the scanner on errors.
    */
-  GNUNET_SCHEDULER_TaskIdentifier kill_task;
+  struct GNUNET_SCHEDULER_Task * kill_task;
 
   /**
    * Default options to use for sharing when adding files during the scan.
@@ -1258,10 +1258,10 @@ static void
 destroy_progress_dialog (struct AddDirClientContext *adcc)
 {
   GNUNET_assert (NULL == adcc->ds);
-  if (GNUNET_SCHEDULER_NO_TASK != adcc->kill_task)
+  if (NULL != adcc->kill_task)
   {
     GNUNET_SCHEDULER_cancel (adcc->kill_task);
-    adcc->kill_task = GNUNET_SCHEDULER_NO_TASK;
+    adcc->kill_task = NULL;
   }
   gtk_widget_destroy (adcc->progress_dialog);
   g_object_unref (G_OBJECT (adcc->progress_dialog_builder));
@@ -1465,7 +1465,7 @@ stop_scanner_task (void *cls,
 {
   struct AddDirClientContext *adcc = cls;
 
-  adcc->kill_task = GNUNET_SCHEDULER_NO_TASK;
+  adcc->kill_task = NULL;
   if (NULL != adcc->ds)
     {
       GNUNET_FS_directory_scan_abort (adcc->ds);
@@ -1562,7 +1562,7 @@ directory_scan_cb (void *cls,
     break;
   case GNUNET_FS_DIRSCANNER_INTERNAL_ERROR:
     if ( (NULL != adcc->ds) &&
-         (GNUNET_SCHEDULER_NO_TASK == adcc->kill_task) )
+         (NULL == adcc->kill_task) )
       {
         insert_progress_dialog_text (adcc, _("Operation failed (press cancel)\n"));
         adcc->kill_task = GNUNET_SCHEDULER_add_now (&stop_scanner_task, adcc);
diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h
index 0919671a..c793feea 100644
--- a/src/include/gnunet_gtk.h
+++ b/src/include/gnunet_gtk.h
@@ -246,7 +246,7 @@ GNUNET_GTK_main_loop_start (const char *binary_name,
                             int argc, char *const *argv,
                             struct GNUNET_GETOPT_CommandLineOption *options,
                             const char *main_window_file,
-                            GNUNET_SCHEDULER_Task main_task);
+                            GNUNET_SCHEDULER_TaskCallback main_task);
 
 
 /**
diff --git a/src/lib/animations.c b/src/lib/animations.c
index 40f1f1e9..504381fc 100644
--- a/src/lib/animations.c
+++ b/src/lib/animations.c
@@ -121,7 +121,7 @@ static struct GNUNET_GTK_AnimationTreeViewHandle *atv_tail;
 /**
  * Task run to update animations.
  */
-static GNUNET_SCHEDULER_TaskIdentifier ticker_task;
+static struct GNUNET_SCHEDULER_Task * ticker_task;
 
 
 /**
@@ -305,7 +305,7 @@ GNUNET_GTK_animation_tree_view_register (GtkTreeView *tv,
   GNUNET_CONTAINER_DLL_insert (atv_head,
                                atv_tail,
                                atv);
-  if (GNUNET_SCHEDULER_NO_TASK == ticker_task)
+  if (NULL == ticker_task)
     ticker_task = GNUNET_SCHEDULER_add_delayed (TICKER_DELAY,
                                                 &ticker,
                                                 NULL);
@@ -328,7 +328,7 @@ GNUNET_GTK_animation_tree_view_unregister (struct GNUNET_GTK_AnimationTreeViewHa
   if (NULL != atv_head)
     return;
   GNUNET_SCHEDULER_cancel (ticker_task);
-  ticker_task = GNUNET_SCHEDULER_NO_TASK;
+  ticker_task = NULL;
 }
 
 
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 1d47f04f..b978a340 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -55,7 +55,7 @@ struct GNUNET_GTK_MainLoop
   /**
    * Initial task to run to setup the system.
    */
-  GNUNET_SCHEDULER_Task main_task;
+  GNUNET_SCHEDULER_TaskCallback main_task;
 
   /**
    * Builder for the main window.
@@ -100,7 +100,7 @@ struct GNUNET_GTK_MainLoop
   /**
    * Task we keep around just to keep the event loop running.
    */
-  GNUNET_SCHEDULER_TaskIdentifier dummy_task;
+  struct GNUNET_SCHEDULER_Task * dummy_task;
 
   /**
    * Remaining command-line arguments.
@@ -233,10 +233,10 @@ GNUNET_GTK_main_loop_quit (struct GNUNET_GTK_MainLoop *ml)
 {
   g_main_loop_quit (ml->gml);
   ml->gml = NULL;
-  if (GNUNET_SCHEDULER_NO_TASK != ml->dummy_task)
+  if (NULL != ml->dummy_task)
   {
     GNUNET_SCHEDULER_cancel (ml->dummy_task);
-    ml->dummy_task = GNUNET_SCHEDULER_NO_TASK;
+    ml->dummy_task = NULL;
   }
 }
 
@@ -989,7 +989,7 @@ GNUNET_GTK_main_loop_start (const char *binary_name, const char *binary_help,
                             int argc, char *const *argv,
                             struct GNUNET_GETOPT_CommandLineOption *options,
                             const char *main_window_file,
-                            GNUNET_SCHEDULER_Task main_task)
+                            GNUNET_SCHEDULER_TaskCallback main_task)
 {
   struct GNUNET_GTK_MainLoop ml;
   int ret;
diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c
index fa5cf4a6..7ae21757 100644
--- a/src/main/gnunet-gtk.c
+++ b/src/main/gnunet-gtk.c
@@ -72,7 +72,7 @@ struct Plug
   /**
    * Task to restart process after crash.
    */
-  GNUNET_SCHEDULER_TaskIdentifier restart_task;
+  struct GNUNET_SCHEDULER_Task * restart_task;
 
   /**
    * ID of the signal associated with the window.
@@ -145,10 +145,10 @@ cleanup_task (void *cls,
       GNUNET_OS_process_destroy (p->proc);
       p->proc = NULL;
     }
-    if (GNUNET_SCHEDULER_NO_TASK != p->restart_task)
+    if (NULL != p->restart_task)
     {
       GNUNET_SCHEDULER_cancel (p->restart_task);
-      p->restart_task = GNUNET_SCHEDULER_NO_TASK;
+      p->restart_task = NULL;
     }
     /* This object is long gone, as part of the cleanup
        of the window from gtk_window_dispose that is
@@ -224,7 +224,7 @@ restart_process (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               _("Restarting crashed plugin `%s'\n"),
               p->binary);
-  p->restart_task = GNUNET_SCHEDULER_NO_TASK;
+  p->restart_task = NULL;
   start_process (p);
 }
 
diff --git a/src/setup/gnunet-setup-transport.c b/src/setup/gnunet-setup-transport.c
index 9168683d..be7f8c7d 100644
--- a/src/setup/gnunet-setup-transport.c
+++ b/src/setup/gnunet-setup-transport.c
@@ -122,7 +122,7 @@ struct GNUNET_SetupAutoContext
   /**
    * Task identifier for the timeout.
    */
-  GNUNET_SCHEDULER_TaskIdentifier tsk;
+  struct GNUNET_SCHEDULER_Task * tsk;
 
   /**
    * Where are we in the test?
@@ -175,7 +175,7 @@ result_callback (void *cls,
   struct GNUNET_SetupAutoContext *ac = cls;
 
   GNUNET_SCHEDULER_cancel (ac->tsk);
-  ac->tsk = GNUNET_SCHEDULER_NO_TASK;
+  ac->tsk = NULL;
   GNUNET_NAT_test_stop (ac->tst);
   ac->tst = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/statistics/gnunet-statistics-gtk.c b/src/statistics/gnunet-statistics-gtk.c
index a53f0b74..4308653c 100644
--- a/src/statistics/gnunet-statistics-gtk.c
+++ b/src/statistics/gnunet-statistics-gtk.c
@@ -121,7 +121,7 @@ static struct GNUNET_STATISTICS_Handle *statistics;
 /**
  * Task that refreshes connection graphic.
  */
-static GNUNET_SCHEDULER_TaskIdentifier connection_task;
+static struct GNUNET_SCHEDULER_Task * connection_task;
 
 /**
  * When did this process start?
@@ -213,10 +213,10 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   ml = NULL;
   GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
   statistics = NULL;
-  if (connection_task != GNUNET_SCHEDULER_NO_TASK)
+  if (connection_task != NULL)
   {
     GNUNET_SCHEDULER_cancel (connection_task);
-    connection_task = GNUNET_SCHEDULER_NO_TASK;
+    connection_task = NULL;
   }
 }