From: Colin Leroy <colin@colino.net>
Date: Tue, 25 Oct 2005 16:14:38 +0000 (+0000)
Subject: 2005-10-25 [colin]	1.9.15cvs106
X-Git-Tag: rel_1_9_99~28
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=0560d0b39412e629e9668e1d9561811277cc8e6e

2005-10-25 [colin]	1.9.15cvs106

	* src/mimeview.c
		Fix encoding issue in Save all and in
		overwrite-confirmation alertpanel
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index f31285721..4ca1d8ede 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-10-25 [colin]	1.9.15cvs106
+
+	* src/mimeview.c
+		Fix encoding issue in Save all and in 
+		overwrite-confirmation alertpanel
+
 2005-10-25 [cleroy]	1.9.15cvs105
 
 	* src/common/socket.c
diff --git a/PATCHSETS b/PATCHSETS
index 9cc6e1e7d..78701c68d 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -942,3 +942,4 @@
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/handling.xml;  ) > 1.9.15cvs103.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/wizard.c;  ) > 1.9.15cvs104.patchset
 ( cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/common/socket.c;  ) > 1.9.15cvs105.patchset
+( cvs diff -u -r 1.83.2.49 -r 1.83.2.50 src/mimeview.c;  ) > 1.9.15cvs106.patchset
diff --git a/configure.ac b/configure.ac
index 36ba56278..972c49f06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=105
+EXTRA_VERSION=106
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mimeview.c b/src/mimeview.c
index 8618d4f9e..57e53c7f9 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1058,7 +1058,9 @@ gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
 		 ? &filename[1] : filename, NULL);
 
 	g_free(filename);
-	return fullname;
+	filename = conv_filename_from_utf8(fullname);
+	g_free(fullname);
+	return filename;
 }
 
 /**
@@ -1079,9 +1081,16 @@ static gboolean mimeview_write_part(const gchar *filename,
 	if (is_file_exist(filename)) {
 		AlertValue aval;
 		gchar *res;
+		gchar *tmp;
+		
+		if (!g_utf8_validate(filename, -1, NULL))
+			tmp = conv_filename_to_utf8(filename);
+		else 
+			tmp = g_strdup(filename);
 		
 		res = g_strdup_printf(_("Overwrite existing file '%s'?"),
-				      filename);
+				      tmp);
+		g_free(tmp);
 		aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK, 
 				  GTK_STOCK_CANCEL, NULL);
 		g_free(res);