Work around something that we think is a GtkHTML bug, where sometimes the

	* folder-browser.c (etree_key): Work around something that we
	think is a GtkHTML bug, where sometimes the adjustments have
	slightly bogus values and scrolling ends up working backwards.
	(Ximian 4939)

	* mail-display.c (do_signature, do_attachment_header): Set the
	icon to be 24x24 here so that (assuming it's not a thumbnail), no
	resizes will have to be queued later. (There's still a bug with
	the text to the left of the button being drawn twice for some
	reason though.)

	* mail-callbacks.c (delete_msg): Fix a bug here that makes
	deleting multiple messages cause a gratuitous message body fetch.
	(Ximian 12355)

svn path=/trunk/; revision=14172

4 files changed, 23 insertions, 2 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8ee5b6e587..2b74b79682 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,20 @@
+2001-10-26  Dan Winship  <danw@ximian.com>
+
+	* folder-browser.c (etree_key): Work around something that we
+	think is a GtkHTML bug, where sometimes the adjustments have
+	slightly bogus values and scrolling ends up working backwards.
+	(Ximian 4939)
+
+	* mail-display.c (do_signature, do_attachment_header): Set the
+	icon to be 24x24 here so that (assuming it's not a thumbnail), no
+	resizes will have to be queued later. (There's still a bug with
+	the text to the left of the button being drawn twice for some
+	reason though.)
+
+	* mail-callbacks.c (delete_msg): Fix a bug here that makes
+	deleting multiple messages cause a gratuitous message body fetch.
+	(Ximian 12355)
+
 2001-10-25  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-callbacks.c (providers_config): Set the GdkWindow of the
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index ff25360f67..ee47e0b1dc 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1696,6 +1696,9 @@ etree_key (ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, FolderBr
 
 	switch (ev->key.keyval) {
 	case GDK_space:
+		/* Work around Ximian 4939 */
+		if (vadj->upper < vadj->page_size)
+			break;
 		if (vadj->value < vadj->upper - vadj->page_size - page_size)
 			vadj->value += page_size;
 		else
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index e5f3749029..e78e288c4e 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1929,7 +1929,7 @@ delete_msg (GtkWidget *button, gpointer user_data)
 				 CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
 	
 	/* Select the next message if we are only deleting one message */
-	if (deleted) {
+	if (deleted == 1) {
 		row = e_tree_row_of_node (fb->message_list->tree,
 					  e_tree_get_cursor (fb->message_list->tree));
 		
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 30cb0bc751..cc42e4bed1 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -608,7 +608,6 @@ pixbuf_gen_idle (struct _PixbufLoader *pbl)
 		gdk_pixbuf_unref (pixbuf);
 	bonobo_ui_toolbar_icon_set_pixbuf (
 		BONOBO_UI_TOOLBAR_ICON (pbl->pixmap), mini);
-  	gtk_widget_set_usize (pbl->pixmap, 24, 24);
 
 	/* Add the pixbuf to the cache */
 	g_hash_table_insert (thumbnail_cache, pbl->cid, mini);
@@ -797,6 +796,7 @@ do_attachment_header (GtkHTML *html, GtkHTMLEmbedded *eb,
 	pbl->type = g_strdup (eb->type);
 	pbl->cid = g_strdup (eb->classid + 6);
 	pbl->pixmap = bonobo_ui_toolbar_icon_new ();
+  	gtk_widget_set_usize (pbl->pixmap, 24, 24);
 	pbl->eb = eb;
 	pbl->destroy_id = gtk_signal_connect (GTK_OBJECT (eb), "destroy",
 					      embeddable_destroy_cb, pbl);
@@ -926,6 +926,7 @@ do_signature (GtkHTML *html, GtkHTMLEmbedded *eb,
 	pbl->type = NULL;
 	pbl->cid = g_strdup (eb->classid);
 	pbl->pixmap = bonobo_ui_toolbar_icon_new ();
+  	gtk_widget_set_usize (pbl->pixmap, 24, 24);
 	pbl->eb = eb;
 	pbl->destroy_id = gtk_signal_connect (GTK_OBJECT (eb), "destroy",
 					      embeddable_destroy_cb, pbl);