diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-09-05 05:07:15 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-09-05 05:07:15 +0800 |
| commit | 983fce5e535e4e203815767cf6899f6dc8c5242a (patch) | |
| tree | d6ca3538c046798597275132c66be6da18733d7f /shell/e-shell-importer.c | |
| parent | c95a226217a68703c48397c23ea8accc491d44e4 (diff) | |
| download | gsoc2013-evolution-983fce5e535e4e203815767cf6899f6dc8c5242a.tar.gz gsoc2013-evolution-983fce5e535e4e203815767cf6899f6dc8c5242a.tar.zst gsoc2013-evolution-983fce5e535e4e203815767cf6899f6dc8c5242a.zip | |
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.
Diffstat (limited to 'shell/e-shell-importer.c')
| -rw-r--r-- | shell/e-shell-importer.c | 7 |
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(); |