1 files changed, 39 insertions, 125 deletions

diff --git a/src/lib/nls.c b/src/lib/nls.c
index 08f74df8..29cb419b 100644
--- a/src/lib/nls.c
+++ b/src/lib/nls.c
@@ -54,28 +54,36 @@ GNUNET_GTK_setup_nls ()
 }
 
 
-char *
-GNUNET_GTK_from_utf8_to_loc (gchar * str_utf8)
+/* This is copied from GLib */
+/**
+ * Obtain character set used for filenames on this system.
+ *
+ * @param filename_charset set to the character set used for filenames
+ * @return TRUE if the locale is utf-8
+ */
+static gboolean
+get_filename_charset (const gchar ** filename_charset)
 {
-  char *str_loc;
-  const char *loc_charset;
-  gboolean is_UTF8;
+  const gchar **charsets;
+  gboolean is_utf8;
 
-  if (NULL == str_utf8)
-    return NULL;
+  is_utf8 = g_get_filename_charsets (&charsets);
 
-  is_UTF8 = g_get_charset (&loc_charset);
-  if (is_UTF8)
-    str_loc = GNUNET_strdup (str_utf8);
-  else
-    str_loc =
-        GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8), loc_charset);
+  if (filename_charset)
+    *filename_charset = charsets[0];
 
-  return str_loc;
+  return is_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_utf8 (gchar * str_loc)
+GNUNET_GTK_from_loc_to_utf8 (const char * str_loc)
 {
   char *str_utf8;
   const char *loc_charset;
@@ -89,27 +97,18 @@ GNUNET_GTK_from_loc_to_utf8 (gchar * str_loc)
     str_utf8 = GNUNET_strdup (str_loc);
   else
     str_utf8 = GNUNET_STRINGS_to_utf8 (str_loc, strlen (str_loc), loc_charset);
-
   return str_utf8;
 }
 
-/* This is copied from GLib */
-static gboolean
-get_filename_charset (const gchar ** filename_charset)
-{
-  const gchar **charsets;
-  gboolean is_utf8;
-
-  is_utf8 = g_get_filename_charsets (&charsets);
-
-  if (filename_charset)
-    *filename_charset = charsets[0];
 
-  return is_utf8;
-}
-
-char *
-GNUNET_GTK_from_filename_to_utf8 (gchar * filename)
+/**
+ * Convert from locale used for filenames to UTF-8.
+ *
+ * @param filename filename in locale encoding
+ * @return filename in utf-8 encoding
+ */
+static char *
+from_filename_to_utf8 (gchar * filename)
 {
   char *str_utf8;
   const char *filename_charset;
@@ -128,107 +127,22 @@ GNUNET_GTK_from_filename_to_utf8 (gchar * filename)
   return str_utf8;
 }
 
-char *
-GNUNET_GTK_from_utf8_to_filename (gchar * str_utf8)
-{
-  char *filename;
-  const char *filename_charset;
-  gboolean is_UTF8;
 
-  if (NULL == str_utf8)
-    return NULL;
-
-  is_UTF8 = get_filename_charset (&filename_charset);
-  if (is_UTF8)
-    filename = GNUNET_strdup (str_utf8);
-  else
-    filename =
-        GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8),
-                                  filename_charset);
-
-  return filename;
-}
-
-char *
-GNUNET_GTK_from_loc_to_filename (gchar * str_loc)
-{
-  char *filename;
-  const char *filename_charset;
-  const char *loc_charset;
-  gboolean is_filename_UTF8, is_loc_UTF8;
-
-  if (NULL == str_loc)
-    return NULL;
-
-  is_filename_UTF8 = get_filename_charset (&filename_charset);
-  is_loc_UTF8 = g_get_charset (&loc_charset);
-  if (is_filename_UTF8 && is_loc_UTF8)
-    filename = GNUNET_strdup (str_loc);
-  else if (is_filename_UTF8)
-    filename = GNUNET_STRINGS_to_utf8 (str_loc, strlen (str_loc), loc_charset);
-  else if (is_loc_UTF8)
-    filename =
-        GNUNET_STRINGS_from_utf8 (str_loc, strlen (str_loc), filename_charset);
-  else
-    /* Pray that iconv() knows these charsets */
-    filename =
-        GNUNET_STRINGS_conv (str_loc, strlen (str_loc), loc_charset,
-                             filename_charset);
-
-  return filename;
-}
-
-char *
-GNUNET_GTK_from_filename_to_loc (gchar * filename)
-{
-  char *str_loc;
-  const char *loc_charset;
-  const char *filename_charset;
-  gboolean is_loc_UTF8, is_filename_UTF8;
-
-  if (NULL == filename)
-    return NULL;
-
-  is_filename_UTF8 = get_filename_charset (&filename_charset);
-  is_loc_UTF8 = g_get_charset (&loc_charset);
-  if (is_loc_UTF8 && is_filename_UTF8)
-    str_loc = GNUNET_strdup (filename);
-  else if (is_loc_UTF8)
-    str_loc =
-        GNUNET_STRINGS_to_utf8 (filename, strlen (filename), filename_charset);
-  else if (is_filename_UTF8)
-    str_loc =
-        GNUNET_STRINGS_from_utf8 (filename, strlen (filename), loc_charset);
-  else
-    /* Pray that iconv() knows these charsets */
-    str_loc =
-        GNUNET_STRINGS_conv (filename, strlen (filename), filename_charset,
-                             loc_charset);
-
-  return str_loc;
-}
-
-/* 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)
-{
-  char *filename_loc;
-  gchar *filename = gtk_file_chooser_get_filename (fc);
-
-  filename_loc = GNUNET_GTK_from_filename_to_loc (filename);
-  g_free (filename);
-  return filename_loc;
-}
-
-gchar *
 GNUNET_GTK_filechooser_get_filename_utf8 (GtkFileChooser * fc)
 {
   char *filename_utf8;
   gchar *filename = gtk_file_chooser_get_filename (fc);
 
-  filename_utf8 = GNUNET_GTK_from_filename_to_utf8 (filename);
+  if (NULL == filename)
+    return NULL;
+  filename_utf8 = from_filename_to_utf8 (filename);
   g_free (filename);
   return filename_utf8;
 }