2 files changed, 42 insertions, 42 deletions

diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index ce04f283..30c2a27d 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -24,8 +24,8 @@
  * @author Christian Grothoff
  */
 
-#ifndef GTKUI_HELPER_H
-#define GTKUI_HELPER_H
+#ifndef GNUNET_GTK_COMMON_H
+#define GNUNET_GTK_COMMON_H
 
 #include <gtk/gtk.h>
 #include <gtk/gtktext.h>
@@ -34,38 +34,38 @@
 #define DEBUG_GTK 0
 
 #if DEBUG_GTK
-#define DEBUG_BEGIN() fprintf(stderr, "BEGIN of %s\n", __FUNCTION__)
-#define DEBUG_MARK() fprintf(stderr, "AT %s:%d\n", __FILE__, __LINE__)
-#define DEBUG_END() fprintf(stderr, "END of %s\n", __FUNCTION__)
+#define GNUNET_GTK_DEBUG_BEGIN() fprintf(stderr, "BEGIN of %s\n", __FUNCTION__)
+#define GNUNET_GTK_DEBUG_MARK() fprintf(stderr, "AT %s:%d\n", __FILE__, __LINE__)
+#define GNUNET_GTK_DEBUG_END() fprintf(stderr, "END of %s\n", __FUNCTION__)
 #else
-#define DEBUG_BEGIN()
-#define DEBUG_MARK()
-#define DEBUG_END()
+#define GNUNET_GTK_DEBUG_BEGIN()
+#define GNUNET_GTK_DEBUG_MARK()
+#define GNUNET_GTK_DEBUG_END()
 #endif
 
-void initGNUnetGTKCommon (struct GE_Context *ectx,
-                          struct GC_Configuration *cfg, void *callback);
+void GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *ectx,
+                          struct GNUNET_GC_Configuration *cfg, void *callback);
 
-void shutdownPlugins (void);
+void GNUNET_GTK_shutdown_plugins (void);
 
-void doneGNUnetGTKCommon (void);
+void GNUNET_GTK_shutdown_common_library (void);
 
 /**
  * Get the name of the main glade file for gnunet-gtk.
  */
-const char *getGladeFileName (void);
+const char *GNUNET_GTK_get_glade_filename (void);
 
 /**
  * Get the GladeXML for the main window of gnunet-gtk.
  */
-GladeXML *getMainXML (void);
+GladeXML *GNUNET_GTK_get_main_glade_XML (void);
 
 /**
  * Appends a message to the info window
  * @param doPopup if GNUNET_YES, the info window will
  *   be opened
  */
-void infoMessage (int doPopup, const char *format, ...);
+void GNUNET_GTK_show_info_message (int doPopup, const char *format, ...);
 
 /**
  * Appends a log entry to the info window
@@ -74,16 +74,25 @@ void infoMessage (int doPopup, const char *format, ...);
  *
  * @param txt the log entry
  */
-void addLogEntry (const char *txt, ...);
+void GNUNET_GTK_add_log_entry (const char *txt, ...);
 
-struct GE_Context *createGtkLogger (GE_KIND mask);
+struct GNUNET_GEContext *GNUNET_GTK_create_gtk_logger (GNUNET_GEKIND mask);
+
+#define GNUNET_GTK_NOTIFY_LEVEL_LOW 0
+#define GNUNET_GTK_NOTIFY_LEVEL_NORMAL 1
+#define GNUNET_GTK_NOTIFY_LEVEL_CRITICAL 2
+
+/**
+ * Sends a message to libnotify
+ */
+void GNUNET_GTK_notify (int type, const char *message, ...);
 
 /**
  * Call a callback function from the mainloop/main thread ("SaveCall").
  * Since GTK doesn't work with multi-threaded applications under Windows,
  * all GTK operations have to be done in the main thread
  */
-void *gtkSaveCall (GNUNET_ThreadMainFunction func, void *arg);
+void *GNUNET_GTK_save_call (GNUNET_ThreadMainFunction func, void *arg);
 
 /**
  * Run the given "cb" function and save calls
@@ -91,57 +100,48 @@ void *gtkSaveCall (GNUNET_ThreadMainFunction func, void *arg);
  * keep save calls going while something else
  * happens).
  */
-void *run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg);
+void *GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg);
 
 /**
  * Bind handlers defined by the various
  * plugins to the signals defined by the
  * Glade XML.
  */
-void connectGladeWithPlugins (GladeXML * xml);
-
-#define NOTIFY_LOW 0
-#define NOTIFY_NORMAL 1
-#define NOTIFY_CRITICAL 2
-
-/**
- * Sends a message to libnotify
- */
-void gnunetgtk_notify (int type, const char *message, ...);
+void GNUNET_GTK_connect_glade_with_plugins (GladeXML * xml);
 
 /**
  * Validate that a string is a Utf-8 string.
  * If validation fails, msg is freed and a valid
  * Utf-8 string is returned.
  */
-char *validate_utf8 (char *msg);
+char *GNUNET_GTK_validate_utf8 (char *msg);
 
 /**
  * Gtk callback to save the main window state (tray icon use)
  */
-void saveMainWindowState (GtkWidget * main_window,
+void GNUNET_GTK_save_main_window_state (GtkWidget * main_window,
                           GdkEventWindowState * event, gpointer user_data);
 
 /**
  * Get the last main window state when restoring (tray icon use)
  */
-GdkWindowState getMainWindowState (void);
+GdkWindowState GNUNET_GTK_get_main_window_state (void);
 
-void gnunet_gtk_main_quit (void);
+void GNUNET_GTK_main_quit (void);
 
 /**
 * Start gnunet-setup, asking for a password if needed
 * @param run_wizard TRUE to run the wizard, FALSE to run the complete tool
 * @returns FALSE if gnunet-setup was run, TRUE else
 */
-gboolean startGNUnetSetup (gboolean run_wizard);
+gboolean GNUNET_GTK_run_gnunet_setup (gboolean run_wizard);
 
 /**
  * Identical to "gtk_tree_selection_selected_foreach",
  * except that modifications of the underlying model
  * during the iteration are tolerated.
  */
-void ggc_tree_selection_selected_foreach (GtkTreeSelection * selection,
+void GNUNET_GTK_tree_selection_selected_foreach (GtkTreeSelection * selection,
                                           GtkTreeSelectionForeachFunc func,
                                           gpointer data);
 
@@ -150,10 +150,10 @@ void ggc_tree_selection_selected_foreach (GtkTreeSelection * selection,
  * except that modifications of the underlying model
  * during the iteration are tolerated.
  */
-void ggc_tree_model_foreach (GtkTreeModel * model,
+void GNUNET_GTK_tree_model_foreach (GtkTreeModel * model,
                              GtkTreeSelectionForeachFunc func, gpointer data);
 
 
-struct GNUNET_CronManager *gnunet_gtk_get_cron (void);
+struct GNUNET_CronManager *GNUNET_GTK_get_cron_manager (void);
 
 #endif
diff --git a/src/include/plibc.h b/src/include/plibc.h
index 2178dc76..d493121b 100644
--- a/src/include/plibc.h
+++ b/src/include/plibc.h
@@ -58,7 +58,7 @@ extern "C"
 /* Conflicts with our definitions */
 #define __G_WIN32_H__
 
-/* Convert LARGE_INTEGER to double */
+/* Convert LARGNUNET_GEINTEGER to double */
 #define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + \
   (double)((x).LowPart))
 
@@ -241,10 +241,10 @@ extern "C"
 
   typedef struct
   {
-    LARGE_INTEGER IdleTime;
-    LARGE_INTEGER KernelTime;
-    LARGE_INTEGER UserTime;
-    LARGE_INTEGER Reserved1[2];
+    LARGNUNET_GEINTEGER IdleTime;
+    LARGNUNET_GEINTEGER KernelTime;
+    LARGNUNET_GEINTEGER UserTime;
+    LARGNUNET_GEINTEGER Reserved1[2];
     ULONG Reserved2;
   } SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;