2004-10-22 [paul] 0.9.12cvs133

	* src/compose.c
	* src/prefs_common.c
	* src/prefs_common.h
	* src/prefs_wrapping.c
		remove 'smart wrapping'

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8dd04c65f8806f30243785d9589917f650cb4336..f0081c93996aaeb97273e730f30534772752bde6 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2004-10-22 [paul]      0.9.12cvs133
+
+       * src/compose.c
+       * src/prefs_common.c
+       * src/prefs_common.h
+       * src/prefs_wrapping.c
+               remove 'smart wrapping'
+
 2004-10-21 [colin]     0.9.12cvs132
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 6d4ca35d5b5048c15a1f2524d278df966b3d159e..beb7692bdc6e2b83bf11aaa83427cb9ce8d98448 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -115,3 +115,4 @@
 ( cvs diff -u -r 1.447 -r 1.448 src/compose.c; cvs diff -u -r 1.9 -r 1.10 src/gtk/menu.c; ) > 0.9.12cvs130.patchset
 ( cvs diff -u -r 1.448 -r 1.449 src/compose.c; ) > 0.9.12cvs131.patchset
 ( cvs diff -u -r 1.449 -r 1.450 src/compose.c; ) > 0.9.12cvs132.patchset
+( cvs diff -u -r 1.450 -r 1.451 src/compose.c; cvs diff -u -r 1.229 -r 1.230 src/prefs_common.c; cvs diff -u -r 1.116 -r 1.117 src/prefs_common.h; cvs diff -u -r 1.2 -r 1.3 src/prefs_wrapping.c; ) > 0.9.12cvs133.patchset

diff --git a/configure.ac b/configure.ac
index abb72250c7225bcc1f1f4dbdcce6578a62c840f1..b63311c53ae8a75e48f32763ef3fa6eab682ddea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=132
+EXTRA_VERSION=133
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/compose.c b/src/compose.c
index b03c2d2f4164a9fe5058008296e22a72ab676bfd..22d443713a3ae457d93fecd7c46691718d3bc9e7 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2712,7 +2712,6 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
                        g_print("l_len=%d wrap_len=%d do_del=%d\n",
                                line_len, linewrap_len, do_delete);
 #endif
-                       /* should we delete to perform smart wrapping */
                        if (line_len < linewrap_len && do_delete) {
                                STEXT_FREEZE();
                                /* get rid of newline */
@@ -4615,11 +4614,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
                GTK_STEXT(text)->cursor_type = GTK_STEXT_CURSOR_BLOCK;
        }
        
-       if (prefs_common.smart_wrapping) {      
-               gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
-               gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
-       }               
-
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 
        gtk_signal_connect(GTK_OBJECT(text), "changed",

diff --git a/src/prefs_common.c b/src/prefs_common.c
index c36869ba1f26394f94d722a570831444d577367d..28d49a5e838d50b5cfcac36226f8b532a3c3fae2 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -296,8 +296,6 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"linewrap_before_sending", "FALSE", &prefs_common.linewrap_at_send, P_BOOL, 
         NULL, NULL, NULL},
-        {"smart_wrapping", "TRUE", &prefs_common.smart_wrapping, P_BOOL, 
-        NULL, NULL, NULL},
         {"autosave", "FALSE", &prefs_common.autosave,
         P_BOOL, &compose.checkbtn_autosave,
         prefs_set_data_from_toggle, prefs_set_toggle},

diff --git a/src/prefs_common.h b/src/prefs_common.h
index a7b5c720b67f0a619fd8fa89b5919cc5b9da502b..dda211824bc31c7bdef4185bf6b6173dfb106dd2 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -107,7 +107,6 @@ struct _PrefsCommon
        gchar *fw_quotefmt;
        gboolean forward_as_attachment;
        gboolean redirect_keep_from;
-       gboolean smart_wrapping;
        gboolean block_cursor;
        gchar *quote_chars;
        

diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c
index 670459cbed8f6479d67058f938217eb97dba7cca..b7ae99aff07d218f1dbff701c6b801c494dd288e 100644 (file)
--- a/src/prefs_wrapping.c
+++ b/src/prefs_wrapping.c
@@ -49,7 +49,6 @@ typedef struct _WrappingPage
        GtkWidget *checkbtn_wrapquote;
        GtkWidget *checkbtn_autowrap;
        GtkWidget *checkbtn_wrapatsend;
-       GtkWidget *checkbtn_smart_wrapping;
 } WrappingPage;
 
 void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window, 
@@ -64,7 +63,6 @@ void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *checkbtn_wrapquote;
        GtkWidget *checkbtn_autowrap;
        GtkWidget *checkbtn_wrapatsend;
-       GtkWidget *checkbtn_smart_wrapping;
        GtkWidget *hbox1;
 
        table = gtk_table_new(8, 3, FALSE);
@@ -91,13 +89,6 @@ void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
-       checkbtn_smart_wrapping = 
-               gtk_check_button_new_with_label(_("Smart wrapping (EXPERIMENTAL)"));
-       gtk_widget_show (checkbtn_smart_wrapping);
-       gtk_table_attach (GTK_TABLE (table), checkbtn_smart_wrapping, 0, 1, 4, 5,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (0), 0, 0);
-       
        hbox1 = gtk_hbox_new (FALSE, 0);
        gtk_widget_show (hbox1);
        gtk_table_attach (GTK_TABLE (table), hbox1, 0, 1, 5, 6,
@@ -124,8 +115,6 @@ void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
                                     prefs_common.linewrap_at_send);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_wrapquote),
                                     prefs_common.linewrap_quote);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_smart_wrapping),
-                                    prefs_common.smart_wrapping);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_linewrap),
                                  prefs_common.linewrap_len);
 
@@ -134,7 +123,6 @@ void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_wrapping->checkbtn_wrapquote      = checkbtn_wrapquote;
        prefs_wrapping->checkbtn_autowrap       = checkbtn_autowrap;
        prefs_wrapping->checkbtn_wrapatsend     = checkbtn_wrapatsend;
-       prefs_wrapping->checkbtn_smart_wrapping = checkbtn_smart_wrapping;
 
        prefs_wrapping->page.widget = table;
 }
@@ -151,8 +139,6 @@ void prefs_wrapping_save(PrefsPage *_page)
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autowrap));
        prefs_common.linewrap_at_send = 
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_wrapatsend));
-       prefs_common.smart_wrapping = 
-               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_smart_wrapping));
 }
 
 static void prefs_wrapping_destroy_widget(PrefsPage *_page)