2005-02-17 [colin] 1.0.1cvs11.5

[claws.git] / src / codeconv.c

diff --git a/src/codeconv.c b/src/codeconv.c
index d36bf87627739f0de0b99ea2dd1998856641ba34..4633d369e84e5d97196be8a81095b09e335bb392 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1805,7 +1805,7 @@ gchar *conv_filename_from_utf8(const gchar *utf8_file)
 
 gchar *conv_filename_to_utf8(const gchar *fs_file)
 {
-       gchar *utf8_file;
+       gchar *utf8_file = NULL;
        GError *error = NULL;
 
        utf8_file = g_filename_to_utf8(fs_file, -1, NULL, NULL, &error);
@@ -1814,8 +1814,12 @@ gchar *conv_filename_to_utf8(const gchar *fs_file)
                          error->message);
                g_error_free(error);
        }
-       if (!utf8_file)
+
+       if (!utf8_file || !g_utf8_validate(utf8_file, -1, NULL)) {
+               g_free(utf8_file);
                utf8_file = g_strdup(fs_file);
+               conv_unreadable_8bit(utf8_file);
+       }
 
        return utf8_file;
 }