don't display code conversion error and line limit warning on draft mode.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@590 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 25 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index d1f78028..e84add93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-09-16
 
+	* src/compose.c: compose_write_to_file(): don't display code
+	  conversion error and line limit warning on draft mode.
+
+2005-09-16
+
 	* libsylph/prefs_common.[ch]
 	  src/prefs_common_dialog.c
 	  src/folderview.[ch]
diff --git a/ChangeLog.ja b/ChangeLog.ja
index c04fdd10..24a631b5 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2005-09-16
 
+	* src/compose.c: compose_write_to_file(): 草稿モードではコード変換
+	  エラーと行長制限の警告を表示しないようにした。
+
+2005-09-16
+
 	* libsylph/prefs_common.[ch]
 	  src/prefs_common_dialog.c
 	  src/folderview.[ch]
diff --git a/src/compose.c b/src/compose.c
index 6a184c7d..3e1e543d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2732,21 +2732,23 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
 		buf = conv_codeset_strdup_full
 			(chars, src_charset, body_charset, &error);
 		if (!buf || error != 0) {
-			AlertValue aval;
+			AlertValue aval = G_ALERTDEFAULT;
 			gchar *msg;
 
 			g_free(buf);
 
-			msg = g_strdup_printf(_("Can't convert the character encoding of the message body from %s to %s.\n"
-						"\n"
-						"Send it as %s anyway?"),
-					      src_charset, body_charset,
-					      src_charset);
-			aval = alertpanel_full
-				(_("Code conversion error"), msg, ALERT_ERROR,
-				 G_ALERTALTERNATE,
-				 FALSE, GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-			g_free(msg);
+			if (!is_draft) {
+				msg = g_strdup_printf(_("Can't convert the character encoding of the message body from %s to %s.\n"
+							"\n"
+							"Send it as %s anyway?"),
+						      src_charset, body_charset,
+						      src_charset);
+				aval = alertpanel_full
+					(_("Code conversion error"), msg, ALERT_ERROR,
+					 G_ALERTALTERNATE,
+					 FALSE, GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+				g_free(msg);
+			}
 
 			if (aval != G_ALERTDEFAULT) {
 				g_free(chars);
@@ -2806,7 +2808,8 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
 		    procmime_get_encoding_str(encoding));
 
 	/* check for line length limit */
-	if (encoding != ENC_QUOTED_PRINTABLE && encoding != ENC_BASE64 &&
+	if (!is_draft &&
+	    encoding != ENC_QUOTED_PRINTABLE && encoding != ENC_BASE64 &&
 	    check_line_length(buf, 1000, &line) < 0) {
 		AlertValue aval;
 		gchar *msg;