diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-28 10:31:47 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-28 23:24:49 +0800 |
| commit | 2c4510e858fcf96e8f3d02f3f92564460752e983 (patch) | |
| tree | 777c673d5fdaf649fb1c9eabd9357eac622b15f6 /mail/mail-send-recv.c | |
| parent | 3fe8269156da1b57b0fc7391f5cf07cab6f61606 (diff) | |
| parent | 067ef5580fc287809958d4503691bfcba2b29ee5 (diff) | |
| download | gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.gz gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.bz2 gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.lz gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.xz gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.zst gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.zip | |
Merge commit 'EVOLUTION_2_27_5' into kill-bonobo
Diffstat (limited to 'mail/mail-send-recv.c')
| -rw-r--r-- | mail/mail-send-recv.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 39fc67e614..7f7c99724d 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -622,7 +622,9 @@ build_dialog (GtkWindow *parent, } gtk_widget_show_all (table); - gtk_widget_show (GTK_WIDGET (gd)); + + if (parent != NULL) + gtk_widget_show (GTK_WIDGET (gd)); g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data); @@ -932,9 +934,9 @@ mail_send_receive (GtkWindow *parent) GList *scan; if (send_recv_dialog != NULL) { - if (GTK_WIDGET_REALIZED(send_recv_dialog)) { - gdk_window_show(send_recv_dialog->window); - gdk_window_raise(send_recv_dialog->window); + if (parent != NULL && GTK_WIDGET_REALIZED (send_recv_dialog)) { + gdk_window_show (send_recv_dialog->window); + gdk_window_raise (send_recv_dialog->window); } return send_recv_dialog; } |