moved outgoing encoding option into Display - Encoding tab.

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

2 files changed, 2 insertions, 2 deletions

diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c
index 7858fb6a..0ab5cb31 100644
--- a/libsylph/prefs_common.c
+++ b/libsylph/prefs_common.c
@@ -56,7 +56,6 @@ static PrefParam param[] = {
 	{"save_message", "TRUE", &prefs_common.savemsg, P_BOOL},
 	{"filter_sent_message", "FALSE", &prefs_common.filter_sent, P_BOOL},
 
-	{"outgoing_charset", NULL, &prefs_common.outgoing_charset, P_STRING},
 	{"encoding_method", "0", &prefs_common.encoding_method, P_ENUM},
 
 	{"allow_jisx0201_kana", "FALSE", &prefs_common.allow_jisx0201_kana,
@@ -249,6 +248,7 @@ static PrefParam param[] = {
 
 	/* Encoding */
 	{"default_encoding", NULL, &prefs_common.default_encoding, P_STRING},
+	{"outgoing_charset", NULL, &prefs_common.outgoing_charset, P_STRING},
 
 	{"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL},
 
diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h
index 929170a0..493d5787 100644
--- a/libsylph/prefs_common.h
+++ b/libsylph/prefs_common.h
@@ -61,7 +61,6 @@ struct _PrefsCommon
 	/* Send */
 	gboolean savemsg;
 	gboolean filter_sent;
-	gchar *outgoing_charset;
 	TransferEncodingMethod encoding_method;
 
 	gboolean allow_jisx0201_kana;
@@ -180,6 +179,7 @@ struct _PrefsCommon
 	/* Encoding */
 	gchar *force_charset;
 	gchar *default_encoding;
+	gchar *outgoing_charset;
 
 	gboolean show_other_header;
 	GSList *disphdr_list;