From: Colin Leroy <colin@colino.net>
Date: Thu, 20 Oct 2005 19:45:53 +0000 (+0000)
Subject: 2005-10-20 [colin]	1.9.15cvs85
X-Git-Tag: rel_1_9_99~50
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=5e025dc377033436b4e343116d17b5d3041c91da;ds=sidebyside

2005-10-20 [colin]	1.9.15cvs85

	* src/textview.c
		Clear xface when clearing textview
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 6e6ffe44e..af404efd5 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-10-20 [colin]	1.9.15cvs85
+
+	* src/textview.c
+		Clear xface when clearing textview
+
 2005-10-20 [colin]	1.9.15cvs84
 
 	* configure.ac
diff --git a/PATCHSETS b/PATCHSETS
index 44d479466..1c5e3da08 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -921,3 +921,4 @@
 ( cvs diff -u -r 1.83.2.48 -r 1.83.2.49 src/mimeview.c;  ) > 1.9.15cvs82.patchset
 ( cvs diff -u -r 1.20.2.5 -r 1.20.2.6 src/gtk/Makefile.am;  cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/gtk/about.c;  diff -u /dev/null src/gtk/authors.h;  ) > 1.9.15cvs83.patchset
 ( cvs diff -u -r 1.654.2.963 -r 1.654.2.964 configure.ac;  cvs diff -u -r 1.207.2.76 -r 1.207.2.77 src/folderview.c;  cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/headerview.c;  cvs diff -u -r 1.115.2.61 -r 1.115.2.62 src/main.c;  cvs diff -u -r 1.204.2.66 -r 1.204.2.67 src/prefs_common.c;  cvs diff -u -r 1.103.2.34 -r 1.103.2.35 src/prefs_common.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_message.c;  cvs diff -u -r 1.96.2.79 -r 1.96.2.80 src/textview.c;  cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/textview.h;  cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/common/defs.h;  cvs diff -u -r 1.36.2.46 -r 1.36.2.47 src/common/utils.c;  cvs diff -u -r 1.20.2.25 -r 1.20.2.26 src/common/utils.h;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/gtk/gtkutils.h;  ) > 1.9.15cvs84.patchset
+( cvs diff -u -r 1.96.2.80 -r 1.96.2.81 src/textview.c;  ) > 1.9.15cvs85.patchset
diff --git a/configure.ac b/configure.ac
index 2ae286450..75cc1779b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/textview.c b/src/textview.c
index cce2489b7..ef952315c 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1121,6 +1121,11 @@ void textview_clear(TextView *textview)
 	textview->uri_list = NULL;
 
 	textview->body_pos = 0;
+	if (textview->image) 
+		gtk_widget_destroy(textview->image);
+	textview->image = NULL;
+	gtk_text_view_set_border_window_size(text, GTK_TEXT_WINDOW_RIGHT, 
+		0);
 }
 
 void textview_destroy(TextView *textview)