Kill the default parent window hack in e-error.c.

Fix as many cases that relied on it as I could find, but there may be
more cases out there.  They should be fixed too.  Passing a NULL parent
window to e_error_new() is illegal and will emit a runtime warning.

1 files changed, 6 insertions, 1 deletions

diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index aba3546443..fbc1b306f5 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -528,7 +528,12 @@ import_assistant_apply (GtkAssistant *assistant, ImportData *data)
 	}
 
 	if (done) {
-		data->import_dialog = e_error_new(NULL, "shell:importing", msg, NULL);
+		gpointer parent;
+
+		parent = gtk_widget_get_parent (data->assistant);
+		parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+
+		data->import_dialog = e_error_new(parent, "shell:importing", msg, NULL);
 		g_signal_connect(data->import_dialog, "response", G_CALLBACK(import_dialog_response), data);
 		data->import_label = gtk_label_new(_("Please wait"));
 		data->import_progress = gtk_progress_bar_new();