talons

commit 349cb44cf22d3d978c160ec43e6d8d80ffda2b69
parent 74b2743351953c0be233429a7c627dd4614c8616
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 21 Dec 2010 20:13:23 +0000

2010-12-21 [colin]	3.7.8cvs16

	* src/textview.c
		Check whether we should continue loading the
		current textview after inserting a possibly
		big image.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/textview.c
 | 
12
+++++++++++-

4 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-21 [colin]	3.7.8cvs16
+
+	* src/textview.c
+		Check whether we should continue loading the
+		current textview after inserting a possibly
+		big image.
+
 2010-12-20 [colin]	3.7.8cvs15
 
 	* src/addrcindex.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4089,3 +4089,4 @@
 ( cvs diff -u -r 1.274.2.319 -r 1.274.2.320 src/mainwindow.c;  ) > 3.7.8cvs13.patchset
 ( cvs diff -u -r 1.382.2.562 -r 1.382.2.563 src/compose.c;  ) > 3.7.8cvs14.patchset
 ( cvs diff -u -r 1.27.2.48 -r 1.27.2.49 src/addr_compl.c;  cvs diff -u -r -1.1.4.10 -r -1.1.4.11 src/addrcindex.c;  cvs diff -u -r -1.1.4.6 -r -1.1.4.7 src/addrcindex.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.58 -r 1.1.4.59 src/gtk/gtksctree.c;  ) > 3.7.8cvs15.patchset
+( cvs diff -u -r 1.96.2.225 -r 1.96.2.226 src/textview.c;  ) > 3.7.8cvs16.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/textview.c b/src/textview.c
@@ -711,6 +711,9 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 				else
 					pixbuf = gdk_pixbuf_new_from_file(filename, &error);
 			}
+			if (textview->stop_loading) {
+				return;
+			}
 			if (error != NULL) {
 				g_warning("%s\n", error->message);
 				g_error_free(error);
@@ -729,7 +732,10 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 				uri->start = gtk_text_iter_get_offset(&iter);
 				
 				gtk_text_buffer_insert_pixbuf(buffer, &iter, pixbuf);
-				
+				if (textview->stop_loading) {
+					g_free(uri);
+					return;
+				}
 				uri->end = uri->start + 1;
 				uri->filename = procmime_get_part_file_name(mimeinfo);
 				textview->uri_list =
@@ -741,6 +747,10 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 						&start_iter, &iter);
 			} else {
 				gtk_text_buffer_insert_pixbuf(buffer, &iter, pixbuf);
+				if (textview->stop_loading) {
+					g_free(uri);
+					return;
+				}
 				gtk_text_buffer_insert(buffer, &iter, " ", 1);
 			}