1 files changed, 28 insertions, 27 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 0abe2f06..8689c8b5 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -82,7 +82,7 @@ static Plugin *plugin;
 
 static void *shutdown_function;
 
-static struct GNUNET_GEContext *ectx;
+static struct GNUNET_GE_Context *ectx;
 
 static struct GNUNET_GC_Configuration *cfg;
 
@@ -113,7 +113,7 @@ saveCallWrapper (gpointer data)
               break;
             }
         }
-      GNUNET_GEASSERT (NULL, i != pscCount);
+      GNUNET_GE_ASSERT (NULL, i != pscCount);
       GNUNET_array_grow (psc, pscCount, pscCount - 1);
       GNUNET_mutex_unlock (sclock);
     }
@@ -206,10 +206,11 @@ connector (const gchar * handler_name,
       if ((module == NULL) ||
           (TRUE != g_module_symbol (module, handler_name, &method)))
         {
-          GNUNET_GELOG (ectx,
-                        GNUNET_GEWARNING | GNUNET_GEDEVELOPER |
-                        GNUNET_GEIMMEDIATE,
-                        _("Failed to find handler for `%s'\n"), handler_name);
+          GNUNET_GE_LOG (ectx,
+                         GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
+                         GNUNET_GE_IMMEDIATE,
+                         _("Failed to find handler for `%s'\n"),
+                         handler_name);
           g_module_close (module);
           return;
         }
@@ -224,7 +225,7 @@ GNUNET_GTK_connect_glade_with_plugins (GladeXML * xml)
   glade_xml_signal_autoconnect_full (xml, &connector, xml);
 }
 
-typedef void (*InitCall) (struct GNUNET_GEContext * ectx,
+typedef void (*InitCall) (struct GNUNET_GE_Context * ectx,
                           struct GNUNET_GC_Configuration * cfg);
 
 typedef void (*PlainCall) (void);
@@ -301,7 +302,7 @@ unloadPlugin (void *p)
 }
 
 void
-GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *e,
+GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *e,
                                       struct GNUNET_GC_Configuration *c,
                                       void *callback)
 {
@@ -333,12 +334,12 @@ GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *e,
 #endif
   GNUNET_free (filename);
 
-  mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGNUNET_GENAME);
+  mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGNUNET_GE_NAME);
   if (mainXML == NULL)
-    GNUNET_GEDIE_STRERROR_FILE (ectx,
-                                GNUNET_GEFATAL | GNUNET_GEUSER |
-                                GNUNET_GEIMMEDIATE, "glade_xml_new",
-                                gladeFile);
+    GNUNET_GE_DIE_STRERROR_FILE (ectx,
+                                 GNUNET_GE_FATAL | GNUNET_GE_USER |
+                                 GNUNET_GE_IMMEDIATE, "glade_xml_new",
+                                 gladeFile);
   /* load the plugins */
   GNUNET_GC_get_configuration_value_string (cfg,
                                             "GNUNET-GTK",
@@ -428,9 +429,9 @@ GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg)
   cls.arg = arg;
   doneThread = GNUNET_thread_create (&shutdownCode, &cls, 64 * 1024);
   if (doneThread == NULL)
-    GNUNET_GEDIE_STRERROR (ectx,
-                           GNUNET_GEFATAL | GNUNET_GEADMIN | GNUNET_GEBULK,
-                           "pthread_create");
+    GNUNET_GE_DIE_STRERROR (ectx,
+                            GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+                            GNUNET_GE_BULK, "pthread_create");
   if (!GNUNET_thread_test_self (mainThread))
     {
       /* another thread will run the save calls */
@@ -488,10 +489,10 @@ GNUNET_GTK_notify (int type, const char *message, ...)
       if (!notify_init ("gnunet-gtk"))
         {
           once = 1;
-          GNUNET_GELOG (ectx,
-                        GNUNET_GEWARNING | GNUNET_GEBULK | GNUNET_GEUSER |
-                        GNUNET_GEADMIN,
-                        _("Could not initialize libnotify\n"));
+          GNUNET_GE_LOG (ectx,
+                         GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
+                         GNUNET_GE_ADMIN,
+                         _("Could not initialize libnotify\n"));
           return;
         }
     }
@@ -515,7 +516,7 @@ GNUNET_GTK_notify (int type, const char *message, ...)
       va_end (arg);
       libnotify = notify_notification_new ("gnunet-gtk",
                                            msg,
-                                           PACKAGNUNET_GEDATA
+                                           PACKAGNUNET_GE_DATA
                                            "/gnunet-gtk/gnunet-gtk-notify.png",
                                            NULL);
       GNUNET_free (msg);
@@ -524,10 +525,10 @@ GNUNET_GTK_notify (int type, const char *message, ...)
       if (!notify_notification_show (libnotify, NULL))
         {
           once = 1;
-          GNUNET_GELOG (ectx,
-                        GNUNET_GEWARNING | GNUNET_GEUSER | GNUNET_GEADMIN |
-                        GNUNET_GEBULK,
-                        _("Could not send notification via libnotify\n"));
+          GNUNET_GE_LOG (ectx,
+                         GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN
+                         | GNUNET_GE_BULK,
+                         _("Could not send notification via libnotify\n"));
         }
       g_object_unref (G_OBJECT (libnotify));
       notify_uninit ();
@@ -558,7 +559,7 @@ GNUNET_GTK_validate_utf8 (char *msg)
   GNUNET_free (msg);
   msg = GNUNET_strdup (ret);
   g_free (ret);
-  GNUNET_GEBREAK (NULL, TRUE == g_utf8_validate (msg, -1, &end));
+  GNUNET_GE_BREAK (NULL, TRUE == g_utf8_validate (msg, -1, &end));
   return msg;
 }
 
@@ -634,7 +635,7 @@ GNUNET_GTK_run_gnunet_setup (gboolean run_wizard)
   messageDialog =
     gtk_message_dialog_new (GTK_WINDOW (mainWindow),
                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                            GTK_MESSAGNUNET_GEWARNING, GTK_BUTTONS_CLOSE,
+                            GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
                             _
                             ("Failed to run the configuration tool (gnunet-setup): %s"),
                             error_message);