1 files changed, 22 insertions, 3 deletions

diff --git a/src/fs/gnunet-fs-gtk-common.c b/src/fs/gnunet-fs-gtk-common.c
index e7cb07f1..1a250c62 100644
--- a/src/fs/gnunet-fs-gtk-common.c
+++ b/src/fs/gnunet-fs-gtk-common.c
@@ -48,13 +48,32 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
                                            const char *data_mime_type,
                                            const char *data, size_t data_len)
 {
+  gchar *data_to_insert = NULL;
+  gboolean freedata = FALSE;
   GtkListStore *ls = GTK_LIST_STORE (cls);
 
-  if ((format == EXTRACTOR_METAFORMAT_UTF8) ||
-      (format == EXTRACTOR_METAFORMAT_C_STRING))
+  if (format == EXTRACTOR_METAFORMAT_UTF8)
+  {
+    if (g_utf8_validate (data, data_len, NULL))
+      data_to_insert = data;
+    else
+      format = EXTRACTOR_METAFORMAT_C_STRING;
+  }
+  if (format == EXTRACTOR_METAFORMAT_C_STRING)
+  {
+    gsize rd, wr;
+    data_to_insert = g_locale_to_utf8 (data, data_len, &rd, &wr, NULL);
+    freedata = TRUE;
+  }
+
+  if (data_to_insert)
+  {
     gtk_list_store_insert_with_values (ls, NULL, G_MAXINT, 0, type, 1, format,
                                        2, EXTRACTOR_metatype_to_string (type),
-                                       3, data, -1);
+                                       3, data_to_insert, -1);
+    if (freedata)
+      g_free (data_to_insert);
+  }
   return 0;
 }