1 files changed, 17 insertions, 21 deletions

diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h
index b2242e96..cbf5c966 100644
--- a/src/include/gnunet_gtk.h
+++ b/src/include/gnunet_gtk.h
@@ -57,7 +57,7 @@ GNUNET_GTK_setup_nls (void);
  * Initialize GTK search path for icons.
  */
 void
-GNUNET_GTK_set_icon_search_path ();
+GNUNET_GTK_set_icon_search_path (void);
 
 
 /**
@@ -87,10 +87,13 @@ GNUNET_GTK_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind);
  * file.
  *
  * @param filename name of the resource file to load
+ * @param user_data user_data to pass to signal handlers,
+ *        use "NULL" to pass the GtkBuilder itself.
  * @return NULL on error
  */
 GtkBuilder *
-GNUNET_GTK_get_new_builder (const char *filename);
+GNUNET_GTK_get_new_builder (const char *filename,
+                            void *user_data);
 
 
 /**
@@ -121,31 +124,24 @@ GNUNET_GTK_tray_icon_create (GtkWindow * main, const char *icon_name,
 void
 GNUNET_GTK_tray_icon_destroy (void);
 
-char *
-GNUNET_GTK_from_utf8_to_loc (gchar * str_utf8);
-
-char *
-GNUNET_GTK_from_loc_to_utf8 (gchar * str_loc);
-
-char *
-GNUNET_GTK_from_filename_to_utf8 (gchar * filename);
-
-char *
-GNUNET_GTK_from_utf8_to_filename (gchar * str_utf8);
 
+/**
+ * Convert a string from the current locale to UTF-8.
+ *
+ * @param str_loc string in current locale
+ * @return string in UTF-8, NULL if str_loc was NULL
+ */
 char *
-GNUNET_GTK_from_loc_to_filename (gchar * str_loc);
+GNUNET_GTK_from_loc_to_utf8 (const char * str_loc);
 
-char *
-GNUNET_GTK_from_filename_to_loc (gchar * filename);
 
-/* Returns filename form filechooser, encoded in locale-dependent
- * encoding, suitable to be given to CRT and/or GNUnet
+/**
+ * Returns filename form filechooser, encoded in UTF-8.
+ *
+ * @param fc file chooser to inspect
+ * @return selected filename as UTF-8, NULL on errors
  */
 char *
-GNUNET_GTK_filechooser_get_filename_loc (GtkFileChooser * fc);
-
-gchar *
 GNUNET_GTK_filechooser_get_filename_utf8 (GtkFileChooser * fc);