1 files changed, 22 insertions, 25 deletions

diff --git a/src/main.c b/src/main.c
index b4325e81..14525733 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,30 +27,18 @@
 #include "config.h"
 #include "gettext.h"
 
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-
 #include <GNUnet/gnunet_util.h>
-#include <GNUnet/gnunet_ecrs_lib.h>
-#include <GNUnet/gnunet_fsui_lib.h>
 
 #include "main.h"
-
-/**
- * FSUI event handler.
- */
-static void eventProcessor(void * cls,
-                           const FSUI_Event * event) {
-  printf("FSUI event received!\n");
-}
+#include "fs.h"
+#include "daemon.h"
+#include "helper.h"
 
 /**
  * Prints the usage information for this command if the user errs.
  */
 static void printhelp() {
   static Help help[] = {
-    { 'a', "anonymity", "LEVEL",
-      gettext_noop("set the desired LEVEL of receiver-anonymity") },
     HELP_CONFIG,
     HELP_HELP,
     HELP_HOSTNAME,
@@ -109,33 +97,42 @@ static int parseOptions(int argc,
 }
 
 GladeXML * mainXML;
-struct FSUI_Context * ctx;
 
 int main(int argc, 
          char *argv[]) {
   
+  g_thread_init(NULL);
   gtk_init(&argc, &argv);
   if (SYSERR == initUtil(argc, 
                          argv, 
                          &parseOptions))
     return 0;
-  
+  startCron();
+  gtkInitSaveCalls();
   /* load the interface */
   mainXML = glade_xml_new(GLADE_FILE,
                           "mainWindow", 
                           NULL);
   /* connect the signals in the interface */
+  setCustomLogProc(&addLogEntry);
   glade_xml_signal_autoconnect(mainXML);
-  
-  /* FSUI initialization here! */
-  ctx = FSUI_start("gnunet-gtk",
-                   YES,
-                   &eventProcessor,
-                   NULL);
-
+  gtk_fs_init();
+  addCronJob(&cronCheckDaemon, 
+             0,
+             15 * cronSECONDS,
+             NULL);
   /* start the event loop */
+  gdk_threads_enter();  
   gtk_main();
-  FSUI_stop(ctx);
+  gdk_threads_leave(); 
+  setCustomLogProc(NULL);
+  gtkDoneSaveCalls();
+  stopCron();
+  delCronJob(&cronCheckDaemon, 
+             15 * cronSECONDS,
+             NULL);
+  gtk_fs_done();
+  g_object_unref(mainXML);
   doneUtil();
   
   return 0;