[GNUnet-SVN] r13583 - gnunet-gtk/src

[gnunet]

Author: grothoff
Date: 2010-11-06 14:22:32 +0100 (Sat, 06 Nov 2010)
New Revision: 13583

Modified:
   gnunet-gtk/src/gnunet-gtk.c
Log:
fixes since scheduler is now gone

Modified: gnunet-gtk/src/gnunet-gtk.c
===================================================================
--- gnunet-gtk/src/gnunet-gtk.c 2010-11-06 11:13:31 UTC (rev 13582)
+++ gnunet-gtk/src/gnunet-gtk.c 2010-11-06 13:22:32 UTC (rev 13583)
@@ -73,11 +73,6 @@
 {
 
   /**
-   * The scheduler.
-   */
-  struct GNUNET_SCHEDULER_Handle *sched;
-
-  /**
    * Main loop.
    */
   GMainLoop *gml;
@@ -218,8 +213,7 @@
        (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 @@
        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 @@
                            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 @@
       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 @@
  */                  
 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 @@
   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 @@
 
   /* 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 @@
                                                           
"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)