From f8888a5bfdb8cdd2c652e825a8f74b96e2178d2c Mon Sep 17 00:00:00 2001
From: Melvin Hadasht <melvin.hadasht@free.fr>
Date: Fri, 26 Jul 2002 13:03:56 +0000
Subject: [PATCH] Fixed a crash introduced in 0.8.0claws5 when log is cut under
 80 characters.

---
 ChangeLog.claws |  6 ++++++
 configure.in    |  2 +-
 src/logwindow.c | 18 ++++++++++--------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index db0d1e830..8aca0c1e0 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-07-26 [melvin]	0.8.0claws17
+
+	* src/logwindow.c
+		Fixed a crash introduced in 0.8.0claws5 when log is 
+		cut under 80 characters.
+
 2002-07-26 [paul]	0.8.0claws16
 
 	* sync with 0.8.1cvs1
diff --git a/configure.in b/configure.in
index 69f87ac28..2549f54c8 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws16
+EXTRA_VERSION=claws17
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/logwindow.c b/src/logwindow.c
index 9412f2270..39ce93654 100644
--- a/src/logwindow.c
+++ b/src/logwindow.c
@@ -165,7 +165,6 @@ void log_window_clear(GtkWidget *text)
 {
         guint length;
 	guint point;
-	gchar *str;
 	
 	length = gtk_text_get_length (GTK_TEXT (text));
 	debug_print(_("Log window length: %u\n"), length);
@@ -177,13 +176,16 @@ void log_window_clear(GtkWidget *text)
        	        point = length - prefs_common.loglength;
 		
 		do {
-			str = gtk_editable_get_chars (GTK_EDITABLE (text),
-					point, point + LOG_AVG_LINE_LEN);
-			if ((lf = strchr(str, '\n')) != NULL)
-				point += lf - str;
-			else 
-				point += LOG_AVG_LINE_LEN;
-			g_free(str);
+			gchar *str;
+			if ((str = gtk_editable_get_chars (GTK_EDITABLE (text),
+					point, point + LOG_AVG_LINE_LEN))) {
+				if ((lf = strchr(str, '\n')) != NULL)
+					point += lf - str;
+				else 
+					point += strlen(str);
+				g_free(str);
+			} else
+				break;
 		} while (lf == NULL);
 				
 		gtk_text_freeze (GTK_TEXT (text));
-- 
2.25.1