3 files changed, 20 insertions, 21 deletions

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 256f99e2..747cd895 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -18,7 +18,6 @@ gnunet_gtk_SOURCES = \
 gnunet_gtk_LDADD = \
   @GTK_LIBS@ \
   -lgnunetutil \
-  -lgnunetutil_boot \
   $(INTLLIBS) \
   -lgthread-2.0 \
   $(top_builddir)/src/common/libgnunetgtk_common.la \
diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index da2ee0e4..dc3f139e 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -651,13 +651,13 @@ initTrayIcon ()
   tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
 
   tray_icon = egg_tray_icon_new (_("GNU's p2p network"));
-  instDir = os_get_installation_path (IPK_DATADIR);
-  iconPath = MALLOC (strlen (instDir) + 40);
+  instDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+  iconPath = GNUNET_malloc (strlen (instDir) + 40);
   strcpy (iconPath, instDir);
   strcat (iconPath, "/../gnunet-gtk/gnunet-gtk-tray.png");
-  FREE (instDir);
+  GNUNET_free (instDir);
   pixbuf = gdk_pixbuf_new_from_file (iconPath, NULL);
-  FREE (iconPath);
+  GNUNET_free (iconPath);
   tray_icon_image = gtk_image_new_from_pixbuf (pixbuf);
   eventbox = gtk_event_box_new ();
   gtk_container_add (GTK_CONTAINER (eventbox), tray_icon_image);
diff --git a/src/core/main.c b/src/core/main.c
index 1bf128c1..da1490af 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -27,11 +27,11 @@
 #include "platform.h"
 #include "gnunetgtk_common.h"
 #include <GNUnet/gnunet_directories.h>
-#include <GNUnet/gnunet_util_boot.h>
+#include <GNUnet/gnunet_util.h>
 #include "eggtrayicon.h"
 
 #ifdef WINDOWS
-static int debug_mode = NO;
+static int debug_mode = GNUNET_NO;
 #endif
 
 static char *cfgFilename = DEFAULT_CLIENT_CONFIG_FILE;
@@ -39,19 +39,19 @@ static char *cfgFilename = DEFAULT_CLIENT_CONFIG_FILE;
 /**
  * All gnunet-gtk command line options
  */
-static struct CommandLineOption gnunetgtkOptions[] = {
-  COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename),  /* -c */
+static struct GNUNET_CommandLineOption gnunetgtkOptions[] = {
+  GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename),  /* -c */
 #ifdef WINDOWS
   {'d', "debug", NULL,
    gettext_noop ("run in debug mode"),
-   0, &gnunet_getopt_configure_set_one, &debug_mode},
+   0, &GNUNET_getopt_configure_set_one, &debug_mode},
 #endif
-  COMMAND_LINE_OPTION_HELP (gettext_noop ("GNUnet GTK user interface.")),       /* -h */
-  COMMAND_LINE_OPTION_HOSTNAME, /* -H */
-  COMMAND_LINE_OPTION_LOGGING,  /* -L */
-  COMMAND_LINE_OPTION_VERSION (VERSION),        /* -v */
-  COMMAND_LINE_OPTION_VERBOSE,
-  COMMAND_LINE_OPTION_END,
+  GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("GNUnet GTK user interface.")),       /* -h */
+  GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
+  GNUNET_COMMAND_LINE_OPTION_LOGGING,  /* -L */
+  GNUNET_COMMAND_LINE_OPTION_VERSION (VERSION),        /* -v */
+  GNUNET_COMMAND_LINE_OPTION_VERBOSE,
+  GNUNET_COMMAND_LINE_OPTION_END,
 };
 
 static void *
@@ -112,9 +112,9 @@ main (int argc, char *const *argv)
 
 #if ENABLE_NLS
   setlocale (LC_ALL, "");
-  path = os_get_installation_path (IPK_LOCALEDIR);
+  path = GNUNET_get_installation_path (GNUNET_IPK_LOCALEDIR);
   BINDTEXTDOMAIN ("gnunet-gtk", path);
-  FREE (path);
+  GNUNET_free (path);
   textdomain ("gnunet-gtk");
   bind_textdomain_codeset ("GNUnet", "UTF-8");
   bind_textdomain_codeset ("gnunet-gtk", "UTF-8");
@@ -125,11 +125,11 @@ main (int argc, char *const *argv)
                                      "LOGGING",
                                      "USER-LEVEL", "WARNING", &log);
   mask = GE_getKIND (log);
-  FREE (log);
+  GNUNET_free (log);
   mask |= mask - 1;             /* set all bits... */
   mask |= GE_USER | GE_BULK | GE_IMMEDIATE;
-  if (YES == GC_get_configuration_value_yesno (cfg,
-                                               "LOGGING", "DEVELOPER", NO))
+  if (GNUNET_YES == GC_get_configuration_value_yesno (cfg,
+                                               "LOGGING", "DEVELOPER", GNUNET_NO))
     mask |= GE_DEVELOPER | GE_REQUEST;
   my_ctx = createGtkLogger (mask);
   GE_setDefaultContext (my_ctx);