2007-04-18 [paul] 2.9.0cvs7

[claws.git] / src / mimeview.c

diff --git a/src/mimeview.c b/src/mimeview.c
index 562f67b76e34957ce90acabec82b57a6bfea4283..fbacdcef593c60097cb0b2444afb25623aaf8d5a 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1370,10 +1370,14 @@ static void mimeview_drag_data_get(GtkWidget        *widget,
        }
        if (filename == NULL)
                filename = g_path_get_basename("Unnamed part");
-               
 
-       tmp = g_filename_from_utf8(filename, -1, NULL, NULL, NULL);
-       
+       if (!g_utf8_validate(filename, -1, NULL))
+               tmp = conv_codeset_strdup(filename,
+                               conv_get_locale_charset_str(),
+                               CS_UTF_8);
+       else
+               tmp = g_strdup(filename);
+
        if (tmp == NULL) {
                g_warning("filename not in UTF-8");
                tmp = g_strdup("Unnamed part");
@@ -1589,8 +1593,15 @@ static void mimeview_save_as(MimeView *mimeview)
        
        if (!g_utf8_validate(partname, -1, NULL)) {
                gchar *tmp = conv_filename_to_utf8(partname);
-               g_free(partname);
-               partname = tmp;
+               if (!tmp) {
+                       tmp = conv_codeset_strdup(partname,
+                               conv_get_locale_charset_str(),
+                               CS_UTF_8);
+               }
+               if (tmp) {
+                       g_free(partname);
+                       partname = tmp;
+               }
        }
 
        subst_for_filename(partname);