2006-10-13 [paul] 2.5.5cvs6
authorPaul Mangan <paul@claws-mail.org>
Fri, 13 Oct 2006 07:24:47 +0000 (07:24 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 13 Oct 2006 07:24:47 +0000 (07:24 +0000)
* manual/advanced.xml
* src/prefs_message.c
make 'respect_flowed_format' a hidden
option, and add a manual entry for it
Thanks to Colin

ChangeLog
PATCHSETS
configure.ac
manual/advanced.xml
src/prefs_message.c

index f5243d500274f4178dc7009ff10b0ddf92740342..f4b17bd22479708a1c7b2923eaa2bb24a1f54104 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-13 [paul]      2.5.5cvs6
+
+       * manual/advanced.xml
+       * src/prefs_message.c
+               make 'respect_flowed_format' a hidden
+               option, and add a manual entry for it
+               Thanks to Colin
+
 2006-10-12 [colin]     2.5.5cvs5
 
        * src/codeconv.c
index 3f2f3a28473bbdaa43b857ee036a5e69a76ed023..d5c9361de56b56bc177f55ca81779793d7101619 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.53.2.19 -r 1.53.2.20 po/POTFILES.in;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/pgp_viewer.c;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/pgpcore/sgpgme.c;  ) > 2.5.5cvs3.patchset
 ( cvs diff -u -r 1.204.2.104 -r 1.204.2.105 src/prefs_common.c;  cvs diff -u -r 1.103.2.62 -r 1.103.2.63 src/prefs_common.h;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_message.c;  cvs diff -u -r 1.49.2.81 -r 1.49.2.82 src/procmime.c;  ) > 2.5.5cvs4.patchset
 ( cvs diff -u -r 1.65.2.50 -r 1.65.2.51 src/codeconv.c;  ) > 2.5.5cvs5.patchset
+( cvs diff -u -r 1.1.2.30 -r 1.1.2.31 manual/advanced.xml;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_message.c;  ) > 2.5.5cvs6.patchset
index fc24047f3285df92460359d21849f259282a693e..01561b415190a59f9a4c25235d0a2e909c001299 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index c256897d19321f7d426a0931d9d498d123da2220..f9a981d6fa11ddf51a8ea0f509f6afbe9200bd93 100644 (file)
          </para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+       <term><literal>respect_flowed_format</literal></term>
+       <listitem>
+         <para>
+       0 or 1. Respect format=flowed on text/plain message parts. This
+       will cause some mails to have long lines, but will fix some URLs
+       that would otherwise be wrapped. Default is 0, turned off.
+         </para>
+       </listitem>
+      </varlistentry>
       <varlistentry>
        <term><literal>smtpssl</literal></term>
        <listitem>
index 904a579089dfeb8d1b752b2001e9c56d7627741e..b9d102953ec065b8ba206cd2251aaf9d144e2fca 100644 (file)
@@ -59,7 +59,6 @@ typedef struct _MessagePage
        GtkWidget *chkbtn_halfpage;
 
        GtkWidget *chkbtn_attach_desc;
-       GtkWidget *chkbtn_respect_flowed_format;
 } MessagePage;
 
 static void disphdr_pane_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget)
@@ -101,7 +100,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *chkbtn_halfpage;
 
        GtkWidget *chkbtn_attach_desc;
-       GtkWidget *chkbtn_respect_flowed_format;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -227,14 +225,8 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
 
        SET_TOGGLE_SENSITIVITY (chkbtn_smoothscroll, hbox_scr)
 
-       vbox2 = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox2);
-       PACK_CHECK_BUTTON(vbox2, chkbtn_attach_desc,
+       PACK_CHECK_BUTTON(vbox1, chkbtn_attach_desc,
                          _("Show attachment descriptions (rather than names)"));
-       PACK_CHECK_BUTTON(vbox2, chkbtn_respect_flowed_format,
-                         _("Respect flowed format"));
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox2,
-                         FALSE, TRUE, 0);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_disphdrpane),
                prefs_common.display_header_pane);
@@ -254,8 +246,6 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
                prefs_common.scroll_halfpage);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_attach_desc),
                prefs_common.attach_desc);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_respect_flowed_format),
-               prefs_common.respect_flowed_format);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_linespc),
                prefs_common.line_space);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_scrollstep),
@@ -272,8 +262,7 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_message->spinbtn_scrollstep = spinbtn_scrollstep;
        prefs_message->chkbtn_halfpage = chkbtn_halfpage;
        prefs_message->chkbtn_attach_desc = chkbtn_attach_desc;
-       prefs_message->chkbtn_respect_flowed_format = chkbtn_respect_flowed_format;
-
+       
        prefs_message->page.widget = vbox1;
 }
 
@@ -297,8 +286,6 @@ void prefs_message_save(PrefsPage *_page)
                GTK_TOGGLE_BUTTON(page->chkbtn_halfpage));
        prefs_common.attach_desc = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->chkbtn_attach_desc));
-       prefs_common.respect_flowed_format = gtk_toggle_button_get_active(
-               GTK_TOGGLE_BUTTON(page->chkbtn_respect_flowed_format));
        prefs_common.line_space = gtk_spin_button_get_value_as_int(
                GTK_SPIN_BUTTON(page->spinbtn_linespc));
        prefs_common.scroll_step = gtk_spin_button_get_value_as_int(