From: Colin Leroy <colin@colino.net>
Date: Fri, 15 Apr 2005 17:18:17 +0000 (+0000)
Subject: 2005-04-15 [colin]	1.9.6cvs37
X-Git-Tag: rel_1_9_9~23
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ab3dca9e65751826d961d7e106d74bb989b7bb56

2005-04-15 [colin]	1.9.6cvs37

	* src/summaryview.c
		Fix 'Save as...' with non-ascii filenames
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 934de2252..26d04ac87 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-04-15 [colin]	1.9.6cvs37
+
+	* src/summaryview.c
+		Fix 'Save as...' with non-ascii filenames
+
 2005-04-15 [colin]	1.9.6cvs36
 
 	* src/plugins/pgpmime/pgpmime.c
diff --git a/PATCHSETS b/PATCHSETS
index 8cdfcc691..8b5290885 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -453,3 +453,4 @@
 ( cvs diff -u -r 1.105.2.21 -r 1.105.2.22 src/prefs_account.c; ) > 1.9.6cvs34.patchset
 ( cvs diff -u -r 1.105.2.22 -r 1.105.2.23 src/prefs_account.c; ) > 1.9.6cvs35.patchset
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpmime/pgpmime.c; ) > 1.9.6cvs36.patchset
+( cvs diff -u -r 1.395.2.66 -r 1.395.2.67 src/summaryview.c; ) > 1.9.6cvs37.patchset
diff --git a/configure.ac b/configure.ac
index a77033664..3dab1cdcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=36
+EXTRA_VERSION=37
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/summaryview.c b/src/summaryview.c
index 21af1b016..482e6b14c 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3356,11 +3356,11 @@ void summary_save_as(SummaryView *summaryview)
 		subst_for_filename(filename);
 	}
 	if (g_getenv ("G_BROKEN_FILENAMES") &&
-	    filename && g_utf8_validate(filename, -1, NULL)) {
+	    filename && !g_utf8_validate(filename, -1, NULL)) {
 		gchar *oldstr = filename;
 		filename = conv_codeset_strdup(filename,
-					       CS_UTF_8,
-					       conv_get_locale_charset_str());
+					       conv_get_locale_charset_str(),
+					       CS_UTF_8);
 		if (!filename) {
 			g_warning("summary_save_as(): faild to convert character set.");
 			filename = g_strdup(oldstr);