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 /plugins/startup-wizard | |
| 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 'plugins/startup-wizard')
| -rw-r--r-- | plugins/startup-wizard/startup-wizard.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 14c4c6cffe..15660dfc47 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -210,11 +210,16 @@ startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target) { EShell *shell; EShellSettings *shell_settings; + GtkWindow *parent; + GList *windows; gchar *location; shell = e_shell_get_default (); shell_settings = e_shell_get_shell_settings (shell); + windows = e_shell_get_watched_windows (shell); + parent = (windows != NULL) ? GTK_WINDOW (windows->data) : NULL; + /* Use System Timezone by default */ e_shell_settings_set_boolean ( shell_settings, "cal-use-system-timezone", TRUE); @@ -227,7 +232,7 @@ startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target) import_iterator = import_importers; import_importer = import_iterator->data; - import_dialog = e_error_new(NULL, "shell:importing", _("Importing data."), NULL); + import_dialog = e_error_new(parent, "shell:importing", _("Importing data."), NULL); g_signal_connect(import_dialog, "response", G_CALLBACK(import_dialog_response), NULL); import_label = gtk_label_new(_("Please wait")); import_progress = gtk_progress_bar_new(); |