From: Colin Leroy <colin@colino.net>
Date: Thu, 16 Jun 2005 21:20:12 +0000 (+0000)
Subject: 2005-06-16 [colin]	1.9.11cvs79
X-Git-Tag: rel_1_9_12~28
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=28831b723ad2ca87b5f9d5988b96ddaf00c1b205

2005-06-16 [colin]	1.9.11cvs79

	* src/compose.c
		Fix bug #707 (Dash splits rows)
		Only wrap if we're on a line break position and
		the previous one was a "white" (space) char.
		Pango stuff is weird.
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 732b17a1b..246861f0b 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2005-06-16 [colin]	1.9.11cvs79
+
+	* src/compose.c
+		Fix bug #707 (Dash splits rows)
+		Only wrap if we're on a line break position and
+		the previous one was a "white" (space) char.
+		Pango stuff is weird.
+
 2005-06-16 [colin]	1.9.11cvs78
 
 	* src/imap_gtk.c
diff --git a/PATCHSETS b/PATCHSETS
index d48cf12e9..9a17e94ca 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -567,3 +567,4 @@
 ( cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/gtk/about.c;  ) > 1.9.11cvs76.patchset
 ( cvs diff -u -r 1.49.2.47 -r 1.49.2.48 src/procmime.c;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/gtk/about.c;  ) > 1.9.11cvs77.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/imap_gtk.c;  cvs diff -u -r 1.47.2.20 -r 1.47.2.21 src/procheader.c;  cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/unmime.c;  cvs diff -u -r 1.36.2.32 -r 1.36.2.33 src/common/utils.c;  cvs diff -u -r 1.20.2.15 -r 1.20.2.16 src/common/utils.h;  ) > 1.9.11cvs78.patchset
+( cvs diff -u -r 1.382.2.132 -r 1.382.2.133 src/compose.c;  ) > 1.9.11cvs79.patchset
diff --git a/configure.ac b/configure.ac
index 45dd97020..de78b0f55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=78
+EXTRA_VERSION=79
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
index 1152189eb..ddb626218 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2702,6 +2702,7 @@ static gboolean compose_get_line_break_pos(GtkTextBuffer *buffer,
 	gint pos = 0;
 	gboolean can_break = FALSE;
 	gboolean do_break = FALSE;
+	gboolean was_white = FALSE;
 
 	gtk_text_iter_forward_to_line_end(&line_end);
 	str = gtk_text_buffer_get_text(buffer, &iter, &line_end, FALSE);
@@ -2735,8 +2736,10 @@ static gboolean compose_get_line_break_pos(GtkTextBuffer *buffer,
 		gunichar wc;
 		gint uri_len;
 
-		if (attr->is_line_break && can_break)
+		if (attr->is_line_break && can_break && was_white)
 			pos = i;
+		
+		was_white = attr->is_white;
 
 		/* don't wrap URI */
 		if ((uri_len = get_uri_len(p)) > 0) {