[evolution-patches] fix for bug #61427



http://bugzilla.ximian.com/show_bug.cgi?id=61427

gtkhtml doesn't clear the selection when we clear it/render a new
message, so we also need to check that the selection is active (hint
from radek).

Hopefully this'll solve the problem?

Jeff

-- 
Jeffrey Stedfast
Evolution Hacker - Novell, Inc.
fejj ximian com  - www.novell.com
? 55303-2.patch
? 55303.patch
? 61427.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3414
diff -u -r1.3414 ChangeLog
--- ChangeLog	10 Jul 2004 01:31:04 -0000	1.3414
+++ ChangeLog	13 Jul 2004 19:22:08 -0000
@@ -1,3 +1,8 @@
+2004-07-13  Jeffrey Stedfast  <fejj novell com>
+
+	* em-folder-view.c (emfv_message_reply): Chck that the selection
+	is active. Hopefully this will fix bug #61427.
+
 2004-07-09  Not Zed  <NotZed Ximian com>
 
 	* em-folder-browser.c (emfb_folder_expunge): only call expunge if
Index: em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.80
diff -u -r1.80 em-folder-view.c
--- em-folder-view.c	23 Jun 2004 08:08:40 -0000	1.80
+++ em-folder-view.c	13 Jul 2004 19:22:08 -0000
@@ -82,6 +82,7 @@
 #include <gtkhtml/htmlobject.h>
 #include <gtkhtml/htmlengine.h>
 #include <gtkhtml/htmlengine-save.h>
+#include <gtkhtml/htmlselection.h>
 
 #include "mail-mt.h"
 #include "mail-ops.h"
@@ -1238,13 +1239,9 @@
 	if (!em_utils_check_user_can_send_mail ((GtkWidget *) emfv))
 		return;
 
-	/*  Look away!  Look away! */
-
-	/* HACK: Nasty internal gtkhtml poking going on here */
-
 	if (((EMFormatHTML *)emfv->preview)->html->engine->selection
-	    && ((EMFormatHTML *)emfv->preview)->html->engine->primary) {
-		/* && GTK_WIDGET_HAS_FOCUS(emfv->preview->formathtml.html)*/
+	    && ((EMFormatHTML *)emfv->preview)->html->engine->primary
+	    && html_engine_is_selection_active (((EMFormatHTML *)emfv->preview)->html->engine)) {
 		HTMLEngineSaveState *state;
 
 		state = html_engine_save_buffer_new(((EMFormatHTML *)emfv->preview)->html->engine, TRUE);

Attachment: smime.p7s
Description: S/MIME cryptographic signature



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]