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 /mail/mail-session.c | |
| parent | c95a226217a68703c48397c23ea8accc491d44e4 (diff) | |
| download | gsoc2013-evolution-983fce5e535e4e203815767cf6899f6dc8c5242a.tar gsoc2013-evolution-983fce5e535e4e203815767cf6899f6dc8c5242a.tar.gz gsoc2013-evolution-983fce5e535e4e203815767cf6899f6dc8c5242a.tar.bz2 gsoc2013-evolution-983fce5e535e4e203815767cf6899f6dc8c5242a.tar.lz gsoc2013-evolution-983fce5e535e4e203815767cf6899f6dc8c5242a.tar.xz 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 'mail/mail-session.c')
| -rw-r--r-- | mail/mail-session.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mail/mail-session.c b/mail/mail-session.c index 27fdaf9942..2d1a1ff1c1 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -322,6 +322,9 @@ user_message_response (GtkDialog *dialog, gint button, struct _user_message_msg static void user_message_exec (struct _user_message_msg *m) { + EShell *shell; + GtkWindow *parent; + GList *windows; const gchar *error_type; if (!m->ismain && user_message_dialog != NULL) { @@ -350,7 +353,12 @@ user_message_exec (struct _user_message_msg *m) g_return_if_reached (); } - user_message_dialog = e_error_new (NULL, error_type, m->prompt, NULL); + shell = e_shell_get_default (); + windows = e_shell_get_watched_windows (shell); + parent = (windows != NULL) ? GTK_WINDOW (windows->data) : NULL; + + user_message_dialog = e_error_new ( + parent, error_type, m->prompt, NULL); g_object_set ( user_message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); |