2006-10-13 [paul] 2.5.5cvs6

[claws.git] / src / prefs_message.c

diff --git a/src/prefs_message.c b/src/prefs_message.c
index 904a579089dfeb8d1b752b2001e9c56d7627741e..b9d102953ec065b8ba206cd2251aaf9d144e2fca 100644 (file)
--- 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_halfpage;
 
        GtkWidget *chkbtn_attach_desc;

-       GtkWidget *chkbtn_respect_flowed_format;

 } MessagePage;
 
 static void disphdr_pane_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget)
 } 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_halfpage;
 
        GtkWidget *chkbtn_attach_desc;

-       GtkWidget *chkbtn_respect_flowed_format;

 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
 
        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)
 
 
        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)"));
                          _("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);
 
        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);
                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),
        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->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;
 }
 
        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));
                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(
        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(