From: Paul Mangan Date: Fri, 13 Oct 2006 07:24:47 +0000 (+0000) Subject: 2006-10-13 [paul] 2.5.5cvs6 X-Git-Tag: rel_2_6_0~36 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1a1f2761a74ede5d1ed81e94f57a4016f54693e6 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 --- diff --git a/ChangeLog b/ChangeLog index f5243d500..f4b17bd22 100644 --- 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 diff --git a/PATCHSETS b/PATCHSETS index 3f2f3a284..d5c9361de 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1991,3 +1991,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index fc24047f3..01561b415 100644 --- a/configure.ac +++ b/configure.ac @@ -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= diff --git a/manual/advanced.xml b/manual/advanced.xml index c256897d1..f9a981d6f 100644 --- a/manual/advanced.xml +++ b/manual/advanced.xml @@ -418,6 +418,16 @@ + + respect_flowed_format + + + 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. + + + smtpssl diff --git a/src/prefs_message.c b/src/prefs_message.c index 904a57908..b9d102953 100644 --- a/src/prefs_message.c +++ b/src/prefs_message.c @@ -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(