fixes since scheduler is now gone

1 files changed, 6 insertions, 18 deletions

diff --git a/src/gnunet-gtk.c b/src/gnunet-gtk.c
index 3da33ecf..d66107dc 100644
--- a/src/gnunet-gtk.c
+++ b/src/gnunet-gtk.c
@@ -73,11 +73,6 @@ struct MainContext
 {
 
   /**
-   * The scheduler.
-   */
-  struct GNUNET_SCHEDULER_Handle *sched;
-
-  /**
    * Main loop.
    */
   GMainLoop *gml;
@@ -218,8 +213,7 @@ schedule_main_loop (void *cls,
        (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) )
     {
       g_main_loop_quit (mc->gml);
-      GNUNET_SCHEDULER_add_now (mc->sched,
-                                &schedule_main_loop,
+      GNUNET_SCHEDULER_add_now (&schedule_main_loop,
                                 mc);
       return;
     }
@@ -256,8 +250,7 @@ schedule_main_loop (void *cls,
         GNUNET_NETWORK_fdset_set_native (mc->ws, fds[nfds].fd);
 #endif
     }
-  GNUNET_SCHEDULER_add_select (mc->sched,
-                               GNUNET_SCHEDULER_PRIORITY_UI,
+  GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_UI,
                                GNUNET_SCHEDULER_NO_TASK,
                                delay,
                                mc->rs,
@@ -288,8 +281,7 @@ run_ready (void *cls,
                             mc->cached_poll_array, 
                             mc->poll_array_active))
     g_main_context_dispatch (mc->gmc);
-  GNUNET_SCHEDULER_add_now (mc->sched,
-                            &schedule_main_loop,
+  GNUNET_SCHEDULER_add_now (&schedule_main_loop,
                             mc);
 }
 
@@ -366,8 +358,7 @@ GNUNET_GTK_quit_cb (GtkObject *object,
       tray_icon = NULL;
     }
   g_main_loop_quit (mc->gml);
-  GNUNET_SCHEDULER_add_now (mc->sched,
-                            &shutdown_task,
+  GNUNET_SCHEDULER_add_now (&shutdown_task,
                             NULL);
 }
 
@@ -544,7 +535,6 @@ add_new_tab ()
  */                   
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -565,7 +555,6 @@ run (void *cls,
   mc->ws = GNUNET_NETWORK_fdset_create ();
   mc->gml = g_main_loop_new (NULL, TRUE);
   mc->gmc = g_main_loop_get_context (mc->gml);
-  mc->sched = sched;  
   mc->cfg = cfg;
   if (mc->builder == NULL)
     return;
@@ -580,8 +569,7 @@ run (void *cls,
 
   /* initialize file-sharing */
   mc->plugins = EXTRACTOR_plugin_add_defaults (EXTRACTOR_OPTION_DEFAULT_POLICY);
-  mc->fs = GNUNET_FS_start (sched,
-                            cfg,
+  mc->fs = GNUNET_FS_start (cfg,
                             "gnunet-gtk",
                             &GNUNET_GTK_fs_event_handler,
                             NULL,
@@ -608,7 +596,7 @@ run (void *cls,
                                                            "GNUNET_GTK_main_menu_file_open_gnunet_directory")));
       /* FIXME: set warning in status bar... */
     }
-  mc->pnc = GNUNET_PEERINFO_notify (cfg, sched,
+  mc->pnc = GNUNET_PEERINFO_notify (cfg, 
                                     &GNUNET_GTK_peerinfo_processor,
                                     NULL);
   if (mc->pnc == NULL)