2008-05-15 [paul] 3.4.0cvs37

	* manual/advanced.xml
	* src/prefs_send.c
		make outgoing_fallback_to_ascii a hidden pref

diff --git a/ChangeLog b/ChangeLog
index 7468c54e8e81d8be9860187fd9042b58b84bc66c..07448341d18b9b76852014a5302e8b149e5c43a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-15 [paul]      3.4.0cvs37
+
+       * manual/advanced.xml
+       * src/prefs_send.c
+               make outgoing_fallback_to_ascii a hidden pref
+

 2008-05-14 [colin]     3.4.0cvs36
 
        * src/main.c
 2008-05-14 [colin]     3.4.0cvs36
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index daf860c7b01637a76ce1781e0ecf935a13a7bcb5..d2b5f0be5f86ed33a3d1ee2257880c1cf281174d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3332,3 +3332,4 @@
 ( cvs diff -u -r 1.382.2.448 -r 1.382.2.449 src/compose.c;  ) > 3.4.0cvs34.patchset
 ( cvs diff -u -r 1.382.2.449 -r 1.382.2.450 src/compose.c;  cvs diff -u -r 1.204.2.169 -r 1.204.2.170 src/prefs_common.c;  cvs diff -u -r 1.103.2.107 -r 1.103.2.108 src/prefs_common.h;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_send.c;  ) > 3.4.0cvs35.patchset
 ( cvs diff -u -r 1.115.2.194 -r 1.115.2.195 src/main.c;  cvs diff -u -r 1.274.2.240 -r 1.274.2.241 src/mainwindow.c;  cvs diff -u -r 1.39.2.44 -r 1.39.2.45 src/mainwindow.h;  ) > 3.4.0cvs36.patchset
 ( cvs diff -u -r 1.382.2.448 -r 1.382.2.449 src/compose.c;  ) > 3.4.0cvs34.patchset
 ( cvs diff -u -r 1.382.2.449 -r 1.382.2.450 src/compose.c;  cvs diff -u -r 1.204.2.169 -r 1.204.2.170 src/prefs_common.c;  cvs diff -u -r 1.103.2.107 -r 1.103.2.108 src/prefs_common.h;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_send.c;  ) > 3.4.0cvs35.patchset
 ( cvs diff -u -r 1.115.2.194 -r 1.115.2.195 src/main.c;  cvs diff -u -r 1.274.2.240 -r 1.274.2.241 src/mainwindow.c;  cvs diff -u -r 1.39.2.44 -r 1.39.2.45 src/mainwindow.h;  ) > 3.4.0cvs36.patchset

+( cvs diff -u -r 1.1.2.47 -r 1.1.2.48 manual/advanced.xml;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_send.c;  ) > 3.4.0cvs37.patchset

diff --git a/configure.ac b/configure.ac
index 5f8108b3fbedb2afe6fa486f32fa54a6eaac5c7f..9c3219b6656989a1039cb5bb54c2f623241cda74 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=36
+EXTRA_VERSION=37

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/manual/advanced.xml b/manual/advanced.xml
index 1ab7db2fea20000b5f456c20daac8936c5e9fba8..8a2dc091dc1275d5960b4a39a81ed53ddec57a0e 100644 (file)
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -644,6 +644,18 @@
          </para>
        </listitem>
       </varlistentry>
          </para>
        </listitem>
       </varlistentry>

+      <varlistentry>
+       <term><literal>outgoing_fallback_to_ascii</literal></term>
+       <listitem>
+         <para>
+       0 or 1. The outgoing encoding of a message will use 7bit US-ASCII
+       whenever it is suitable for the message content, ignoring the
+       Outgoing Encoding option unless it is necessary. Turning this
+       option off forces the user-defined content to be used, regardless
+       of message content. Default is 1, turned on.
+         </para>
+       </listitem>
+      </varlistentry>

       <varlistentry>
        <term><literal>respect_flowed_format</literal></term>
        <listitem>
       <varlistentry>
        <term><literal>respect_flowed_format</literal></term>
        <listitem>

diff --git a/src/prefs_send.c b/src/prefs_send.c
index 0985ef364a70e2857a44e697383fdfb725d82c8d..090953ff5da0210b46f853b0908863e2d46ca471 100644 (file)
--- a/src/prefs_send.c
+++ b/src/prefs_send.c
@@ -53,7 +53,6 @@ typedef struct _SendPage
        GtkWidget *checkbtn_senddialog;
        GtkWidget *combobox_charset;
        GtkWidget *combobox_encoding_method;
        GtkWidget *checkbtn_senddialog;
        GtkWidget *combobox_charset;
        GtkWidget *combobox_encoding_method;

-       GtkWidget *checkbtn_outgoing_fallback_to_ascii;

 } SendPage;
 
 static gchar * prefs_common_charset_set_data_from_optmenu(GtkWidget *widget)
 } SendPage;
 
 static gchar * prefs_common_charset_set_data_from_optmenu(GtkWidget *widget)


@@ -135,7 +134,6 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *vbox1;
        GtkWidget *vbox2;
        GtkWidget *checkbtn_savemsg;
        GtkWidget *vbox1;
        GtkWidget *vbox2;
        GtkWidget *checkbtn_savemsg;

-       GtkWidget *checkbtn_outgoing_fallback_to_ascii;

        GtkWidget *label_outcharset;
        GtkWidget *combobox_charset;
        GtkListStore *optmenu;
        GtkWidget *label_outcharset;
        GtkWidget *combobox_charset;
        GtkListStore *optmenu;


@@ -170,7 +168,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON(vbox2, checkbtn_senddialog,
                        _("Show send dialog"));
 
        PACK_CHECK_BUTTON(vbox2, checkbtn_senddialog,
                        _("Show send dialog"));
 

-       table = gtk_table_new(2, 3, FALSE);
+       table = gtk_table_new(2, 2, FALSE);

        gtk_widget_show(table);
        gtk_container_add (GTK_CONTAINER (vbox1), table);
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_widget_show(table);
        gtk_container_add (GTK_CONTAINER (vbox1), table);
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);


@@ -296,15 +294,6 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        COMBOBOX_ADD(optmenu, "quoted-printable", CTE_QUOTED_PRINTABLE);
        COMBOBOX_ADD(optmenu, "8bit",            CTE_8BIT);
 
        COMBOBOX_ADD(optmenu, "quoted-printable", CTE_QUOTED_PRINTABLE);
        COMBOBOX_ADD(optmenu, "8bit",            CTE_8BIT);
 

-       checkbtn_outgoing_fallback_to_ascii = gtk_check_button_new_with_label(
-                       _("Fallback to 7bit US-ASCII when possible"));
-       gtk_widget_show(checkbtn_outgoing_fallback_to_ascii);
-       gtk_table_attach(GTK_TABLE(table), checkbtn_outgoing_fallback_to_ascii, 
-                       0, 3, 3, 4,
-                       (GtkAttachOptions) (GTK_FILL),
-                       (GtkAttachOptions) (0), 0, 0);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_outgoing_fallback_to_ascii),
-               prefs_common.outgoing_fallback_to_ascii);

        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_savemsg),
                prefs_common.savemsg);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_confirm_send_queued_messages),
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_savemsg),
                prefs_common.savemsg);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_confirm_send_queued_messages),


@@ -321,7 +310,6 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_send->window                      = GTK_WIDGET(window);
        
        prefs_send->checkbtn_savemsg = checkbtn_savemsg;
        prefs_send->window                      = GTK_WIDGET(window);
        
        prefs_send->checkbtn_savemsg = checkbtn_savemsg;

-       prefs_send->checkbtn_outgoing_fallback_to_ascii = checkbtn_outgoing_fallback_to_ascii;

        prefs_send->checkbtn_confirm_send_queued_messages = checkbtn_confirm_send_queued_messages;
        prefs_send->checkbtn_never_send_retrcpt = checkbtn_never_send_retrcpt;
        prefs_send->checkbtn_senddialog = checkbtn_senddialog;
        prefs_send->checkbtn_confirm_send_queued_messages = checkbtn_confirm_send_queued_messages;
        prefs_send->checkbtn_never_send_retrcpt = checkbtn_never_send_retrcpt;
        prefs_send->checkbtn_senddialog = checkbtn_senddialog;


@@ -337,8 +325,6 @@ static void prefs_send_save(PrefsPage *_page)
 
        prefs_common.savemsg = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_savemsg));
 
        prefs_common.savemsg = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_savemsg));

-       prefs_common.outgoing_fallback_to_ascii = gtk_toggle_button_get_active(
-               GTK_TOGGLE_BUTTON(page->checkbtn_outgoing_fallback_to_ascii));

        prefs_common.confirm_send_queued_messages = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_confirm_send_queued_messages));
        prefs_common.never_send_retrcpt = gtk_toggle_button_get_active(
        prefs_common.confirm_send_queued_messages = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_confirm_send_queued_messages));
        prefs_common.never_send_retrcpt = gtk_toggle_button_get_active(