From e06b88c4fda627599d7c1a33ddec0a35a4374e4f Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 13 Oct 2009 16:24:10 +0200
Subject: Bug #594471 - Shouldn't call e_error_new/run with NULL 'parent'

---
 mail/mail-mt.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'mail/mail-mt.c')

diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 011697b76a..16d593c0f3 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -292,12 +292,10 @@ static void error_response(GtkObject *o, gint button, gpointer data)
 void
 mail_msg_check_error (gpointer msg)
 {
-	EShell *shell;
 	GtkWindow *parent;
 	MailMsg *m = msg;
 	gchar *what;
 	GtkDialog *gd;
-	GList *windows;
 
 #ifdef MALLOC_CHECK
 	checkmem(m);
@@ -325,9 +323,7 @@ mail_msg_check_error (gpointer msg)
 		return;
 	}
 
-	shell = e_shell_get_default ();
-	windows = e_shell_get_watched_windows (shell);
-	parent = (windows != NULL) ? GTK_WINDOW (windows->data) : NULL;
+	parent = e_shell_get_active_window (NULL);
 
 	if (m->info->desc
 	    && (what = m->info->desc (m))) {
-- 
cgit