1 files changed, 32 insertions, 19 deletions

diff --git a/src/lib/nls.c b/src/lib/nls.c
index f313ce59..08f74df8 100644
--- a/src/lib/nls.c
+++ b/src/lib/nls.c
@@ -55,7 +55,7 @@ GNUNET_GTK_setup_nls ()
 
 
 char *
-GNUNET_GTK_from_utf8_to_loc (gchar *str_utf8)
+GNUNET_GTK_from_utf8_to_loc (gchar * str_utf8)
 {
   char *str_loc;
   const char *loc_charset;
@@ -68,13 +68,14 @@ GNUNET_GTK_from_utf8_to_loc (gchar *str_utf8)
   if (is_UTF8)
     str_loc = GNUNET_strdup (str_utf8);
   else
-    str_loc = GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8), loc_charset);
+    str_loc =
+        GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8), loc_charset);
 
   return str_loc;
 }
 
 char *
-GNUNET_GTK_from_loc_to_utf8 (gchar *str_loc)
+GNUNET_GTK_from_loc_to_utf8 (gchar * str_loc)
 {
   char *str_utf8;
   const char *loc_charset;
@@ -94,21 +95,21 @@ GNUNET_GTK_from_loc_to_utf8 (gchar *str_loc)
 
 /* This is copied from GLib */
 static gboolean
-get_filename_charset (const gchar **filename_charset)
+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)
+GNUNET_GTK_from_filename_to_utf8 (gchar * filename)
 {
   char *str_utf8;
   const char *filename_charset;
@@ -121,13 +122,14 @@ GNUNET_GTK_from_filename_to_utf8 (gchar *filename)
   if (is_UTF8)
     str_utf8 = GNUNET_strdup (filename);
   else
-    str_utf8 = GNUNET_STRINGS_to_utf8 (filename, strlen (filename), filename_charset);
+    str_utf8 =
+        GNUNET_STRINGS_to_utf8 (filename, strlen (filename), filename_charset);
 
   return str_utf8;
 }
 
 char *
-GNUNET_GTK_from_utf8_to_filename (gchar *str_utf8)
+GNUNET_GTK_from_utf8_to_filename (gchar * str_utf8)
 {
   char *filename;
   const char *filename_charset;
@@ -140,13 +142,15 @@ GNUNET_GTK_from_utf8_to_filename (gchar *str_utf8)
   if (is_UTF8)
     filename = GNUNET_strdup (str_utf8);
   else
-    filename = GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8), filename_charset);
+    filename =
+        GNUNET_STRINGS_from_utf8 (str_utf8, strlen (str_utf8),
+                                  filename_charset);
 
   return filename;
 }
 
 char *
-GNUNET_GTK_from_loc_to_filename (gchar *str_loc)
+GNUNET_GTK_from_loc_to_filename (gchar * str_loc)
 {
   char *filename;
   const char *filename_charset;
@@ -163,16 +167,19 @@ GNUNET_GTK_from_loc_to_filename (gchar *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);
+    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);
+    filename =
+        GNUNET_STRINGS_conv (str_loc, strlen (str_loc), loc_charset,
+                             filename_charset);
 
   return filename;
 }
 
 char *
-GNUNET_GTK_from_filename_to_loc (gchar *filename)
+GNUNET_GTK_from_filename_to_loc (gchar * filename)
 {
   char *str_loc;
   const char *loc_charset;
@@ -187,12 +194,16 @@ GNUNET_GTK_from_filename_to_loc (gchar *filename)
   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);
+    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);
+    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);
+    str_loc =
+        GNUNET_STRINGS_conv (filename, strlen (filename), filename_charset,
+                             loc_charset);
 
   return str_loc;
 }
@@ -201,20 +212,22 @@ GNUNET_GTK_from_filename_to_loc (gchar *filename)
  * encoding, suitable to be given to CRT and/or GNUnet
  */
 char *
-GNUNET_GTK_filechooser_get_filename_loc (GtkFileChooser *fc)
+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)
+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);
   g_free (filename);
   return filename_utf8;