2004-10-21 [colin] 0.9.12cvs133

	* src/compose.c
		Sync with HEAD (Remove extra separator in compose's Options)
	* src/textview.c
		Set wrapping to char

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ae31815194cd229bc5a0abd86585849d0744679d..ee0009bcf5951ec35f3bd40780ff63c194204a1b 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2004-10-21 [colin]     0.9.12cvs133
+
+       * src/compose.c
+               Sync with HEAD (Remove extra separator in compose's Options)
+       * src/textview.c
+               Set wrapping to char
+
 2004-10-21 [paul]      0.9.12cvs131.2
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 57e1d9a6714cf7f92b8209e8c1d343107b8b3f8f..9c2f976150bf9a05e67e7af506cd340afb3eedbc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -205,3 +205,4 @@
 ( cvs diff -u -r 1.52.2.6 -r 1.52.2.7 src/prefs_folder_item.c; ) > 0.9.12cvs130.2.patchset
 ( cvs diff -u -r 1.2504.2.25 -r 1.2504.2.26 ChangeLog.claws; cvs diff -u -r 1.382.2.53 -r 1.382.2.54 src/compose.c; ) > 0.9.12cvs131.1.patchset
 ( cvs diff -u -r 1.382.2.54 -r 1.382.2.55 src/compose.c; cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/sourcewindow.c; ) > 0.9.12cvs131.2.patchset
+( cvs diff -u -r 1.382.2.55 -r 1.382.2.56 src/compose.c; cvs diff -u -r 1.96.2.23 -r 1.96.2.24 src/textview.c; ) > 0.9.12cvs133.patchset

diff --git a/configure.ac b/configure.ac
index 9903659fbc76fb2623a2c2a74308e567b21075b7..2513751cf2eaad8cdf02b735f935af3535bb7ed3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,13 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=131
+EXTRA_VERSION=133
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+<<<<<<< configure.ac
+EXTRA_GTK2_VERSION=.0
+=======
+EXTRA_GTK2_VERSION=.0
+>>>>>>> 1.654.2.239
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/compose.c b/src/compose.c
index fec82b0ec52607892167e141c21578e7398ee159..2e8ee26c5e1e0e183ef46868346e4c81d2c391e3 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -637,7 +637,6 @@ static GtkItemFactoryEntry compose_entries[] =
                                        NULL, NULL, 0, "<Branch>"},
 #endif
        {N_("/_Options"),               NULL, NULL, 0, "<Branch>"},
-       {N_("/_Options/---"),           NULL, NULL, 0, "<Separator>"},
        {N_("/_Options/Privacy System"),                NULL, NULL,   0, "<Branch>"},
        {N_("/_Options/Privacy System/None"),   NULL, compose_set_privacy_system_cb,   0, "<RadioItem>"},
        {N_("/_Options/Si_gn"),         NULL, compose_toggle_sign_cb   , 0, "<ToggleItem>"},

diff --git a/src/textview.c b/src/textview.c
index 8ec158b460e27afb253d487a9bf333af13f5e1fd..e659a4e5b8212cfe0bc1cdee1c2b3fcc55284d17 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -187,7 +187,7 @@ TextView *textview_create(void)
        text = gtk_text_view_new();
        gtk_widget_show(text);
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
-       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
        gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text), FALSE);
        g_signal_connect(G_OBJECT(text), "populate-popup",
                 G_CALLBACK(populate_popup), NULL);