From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 30 Nov 2001 07:12:34 +0000 (+0000)
Subject: remove conflicts
X-Git-Tag: rel_0_6_6~87
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=5b6b7e444b582d41449c715385f5f257ce0bb7b5

remove conflicts
---

diff --git a/src/compose.c b/src/compose.c
index 523274b7b..7a220bb9b 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2405,93 +2405,7 @@ static void compose_wrap_line_all(Compose *compose)
 
 	gtk_stext_thaw(text);
 }
-<<<<<<< compose.c
-
-#if 0
-static void compose_wrap_line_all(Compose *compose)
-{
-	GtkText *text = GTK_STEXT(compose->text);
-	guint text_len;
-	guint line_pos = 0, cur_pos = 0;
-	gint line_len = 0, cur_len = 0;
-	gint ch_len;
-	gchar cbuf[MB_LEN_MAX];
-
-	gtk_stext_freeze(text);
-
-	text_len = gtk_stext_get_length(text);
-
-	for (; cur_pos < text_len; cur_pos++) {
-		if (text->use_wchar)
-			ch_len = wctomb
-				(cbuf, (wchar_t)GTK_STEXT_INDEX(text, cur_pos));
-		else {
-			cbuf[0] = GTK_STEXT_INDEX(text, cur_pos);
-			ch_len = 1;
-		}
-
-		if (ch_len == 1 && *cbuf == '\n') {
-			line_pos = cur_pos + 1;
-			line_len = cur_len = 0;
-			continue;
-		}
-
-		if (ch_len < 0) {
-			cbuf[0] = '\0';
-			ch_len = 1;
-		}
-=======
->>>>>>> 1.110
-
-<<<<<<< compose.c
-		if (ch_len == 1 && isspace(*cbuf)) {
-			line_pos = cur_pos + 1;
-			line_len = cur_len + ch_len;
-		}
-=======
 #undef GET_CHAR
->>>>>>> 1.110
-
-		if (cur_len + ch_len > prefs_common.linewrap_len &&
-		    line_len > 0) {
-			gint tlen;
-
-			if (text->use_wchar)
-				tlen = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, line_pos - 1));
-			else {
-				cbuf[0] = GTK_STEXT_INDEX(text, line_pos - 1);
-				tlen = 1;
-			}
-			if (tlen == 1 && isspace(*cbuf)) {
-				gtk_stext_set_point(text, line_pos);
-				gtk_stext_backward_delete(text, 1);
-				text_len--;
-				cur_pos--;
-				line_pos--;
-				cur_len--;
-				line_len--;
-			}
-
-			gtk_stext_set_point(text, line_pos);
-			gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
-			text_len++;
-			cur_pos++;
-			line_pos++;
-			cur_len = cur_len - line_len + ch_len;
-			line_len = 0;
-			continue;
-		}
-
-		if (ch_len > 1) {
-			line_pos = cur_pos + 1;
-			line_len = cur_len + ch_len;
-		}
-		cur_len += ch_len;
-	}
-
-	gtk_stext_thaw(text);
-}
-#endif
 
 static void compose_set_title(Compose *compose)
 {