*sigh* apparently forgot to send this patch in for review yesterday. simple fix to close the search dialog when the message-window closes so that the search dialog doesn't act on an invalid object and cause a crash. Jeff -- Jeffrey Stedfast Evolution Hacker - Novell, Inc. fejj ximian com - www.novell.com
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3430
diff -u -r1.3430 ChangeLog
--- ChangeLog 10 Aug 2004 19:10:06 -0000 1.3430
+++ ChangeLog 11 Aug 2004 19:37:28 -0000
@@ -1,3 +1,20 @@
+2004-08-11 Jeffrey Stedfast <fejj novell com>
+
+ Fix for bug #62812
+
+ * em-format-html-display.c (efhd_init): Connect to the html
+ widget's destroy.
+ (efhd_gtkhtml_destroy): If a search dialog is open, close it.
+
+2004-08-10 Jeffrey Stedfast <fejj novell com>
+
+ Partial fix for bug #62771
+
+ * em-format-quote.c (emfq_format_header): Same.
+
+ * em-format-html.c (efh_format_header): Decode the
+ X-Mailer/User-Agent headers.
+
2004-08-06 Jeffrey Stedfast <fejj novell com>
* em-folder-tree-model.c (em_folder_tree_model_get_selected):
Index: em-format-html-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.c,v
retrieving revision 1.49
diff -u -r1.49 em-format-html-display.c
--- em-format-html-display.c 6 Aug 2004 17:36:01 -0000 1.49
+++ em-format-html-display.c 11 Aug 2004 19:37:28 -0000
@@ -231,6 +231,15 @@
}
static void
+efhd_gtkhtml_destroy (GtkHTML *html, EMFormatHTMLDisplay *efhd)
+{
+ struct _EMFormatHTMLDisplayPrivate *p = efhd->priv;
+
+ if (p->search_dialog)
+ efhd_search_response (p->search_dialog, GTK_RESPONSE_CANCEL, efhd);
+}
+
+static void
efhd_init(GObject *o)
{
EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *)o;
@@ -242,7 +251,8 @@
html_engine_set_tokenizer(efh->html->engine, (HTMLTokenizer *)efhd->search_tok);
g_signal_connect(efh->html, "realize", G_CALLBACK(efhd_gtkhtml_realise), o);
-
+ g_signal_connect(efh->html, "destroy", G_CALLBACK(efhd_gtkhtml_destroy), o);
+
/* we want to convert url's etc */
efh->text_html_flags |= CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
#undef efh
Attachment:
smime.p7s
Description: S/MIME cryptographic signature