aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2004-08-23 23:27:10 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-08-23 23:27:10 +0800
commit53aa17c033a91cebe59668acba2e469d542d69f7 (patch)
tree73341b96ca4c8164679bd3349d5b835b3d9d75c6
parent4a7ece572afa9402b6610ff197df9564cd768e2b (diff)
downloadgsoc2013-evolution-53aa17c033a91cebe59668acba2e469d542d69f7.tar
gsoc2013-evolution-53aa17c033a91cebe59668acba2e469d542d69f7.tar.gz
gsoc2013-evolution-53aa17c033a91cebe59668acba2e469d542d69f7.tar.bz2
gsoc2013-evolution-53aa17c033a91cebe59668acba2e469d542d69f7.tar.lz
gsoc2013-evolution-53aa17c033a91cebe59668acba2e469d542d69f7.tar.xz
gsoc2013-evolution-53aa17c033a91cebe59668acba2e469d542d69f7.tar.zst
gsoc2013-evolution-53aa17c033a91cebe59668acba2e469d542d69f7.zip
Fix for bug #62812
2004-08-13 Jeffrey Stedfast <fejj@novell.com> Fix for bug #62812 * em-format-html-display.c (em_format_html_display_search): Set the search_dialog to be transient for the parent window and make sure to destroy the search_dialog when the parent gets destroyed. svn path=/trunk/; revision=26995
-rw-r--r--mail/ChangeLog12
-rw-r--r--mail/em-format-html-display.c4
2 files changed, 13 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 20ead3b1c8..ef6a9c8b17 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,7 +1,15 @@
+2004-08-13 Jeffrey Stedfast <fejj@novell.com>
+
+ Fix for bug #62812
+
+ * em-format-html-display.c (em_format_html_display_search): Set
+ the search_dialog to be transient for the parent window and make
+ sure to destroy the search_dialog when the parent gets destroyed.
+
2004-08-21 Sivaiah Nallagatla <snallagatla@novell.com>
- * mail-erros.xml : changed the groupwise account setup error
- message
+ * mail-erros.xml : changed the groupwise account setup error
+ message
2004-08-16 Not Zed <NotZed@Ximian.com>
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index e0d5977153..96e65e2d5c 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -242,7 +242,7 @@ efhd_init(GObject *o)
html_engine_set_tokenizer(efh->html->engine, (HTMLTokenizer *)efhd->search_tok);
g_signal_connect(efh->html, "realize", G_CALLBACK(efhd_gtkhtml_realise), 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
@@ -517,6 +517,8 @@ em_format_html_display_search(EMFormatHTMLDisplay *efhd)
p->search_wrap = FALSE;
gtk_dialog_set_default_response((GtkDialog *)p->search_dialog, GTK_RESPONSE_ACCEPT);
+ e_dialog_set_transient_for ((GtkWindow *) p->search_dialog, (GtkWidget *) ((EMFormatHTML *) efhd)->html);
+ gtk_window_set_destroy_with_parent ((GtkWindow *) p->search_dialog, TRUE);
efhd_update_matches(efhd);
g_signal_connect(p->search_entry, "activate", G_CALLBACK(efhd_search_entry_activate), efhd);