diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-06-24 17:44:06 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-06-24 17:45:37 +0800 |
| commit | 4cda728c0947ac35e52d4726e8eefc115c7b30be (patch) | |
| tree | 0565865ef11366128877bfcfb39651386c99cc18 /mail/mail-send-recv.c | |
| parent | 3981ae7000814291e5b0d1249c898cb105adc334 (diff) | |
| download | gsoc2013-evolution-4cda728c0947ac35e52d4726e8eefc115c7b30be.tar gsoc2013-evolution-4cda728c0947ac35e52d4726e8eefc115c7b30be.tar.gz gsoc2013-evolution-4cda728c0947ac35e52d4726e8eefc115c7b30be.tar.bz2 gsoc2013-evolution-4cda728c0947ac35e52d4726e8eefc115c7b30be.tar.lz gsoc2013-evolution-4cda728c0947ac35e52d4726e8eefc115c7b30be.tar.xz gsoc2013-evolution-4cda728c0947ac35e52d4726e8eefc115c7b30be.tar.zst gsoc2013-evolution-4cda728c0947ac35e52d4726e8eefc115c7b30be.zip | |
Bug 719379 - Send/Receive dialog doesn't close on errors properly
Diffstat (limited to 'mail/mail-send-recv.c')
| -rw-r--r-- | mail/mail-send-recv.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index d6b0edd4c9..0bd074b759 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -1242,15 +1242,19 @@ receive_update_got_folderinfo (GObject *source_object, /* Ignore cancellations. */ if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_warn_if_fail (info != NULL); + g_warn_if_fail (info == NULL); g_error_free (local_error); + receive_done (send_info); + /* XXX Need to hand this off to an EAlertSink. */ } else if (local_error != NULL) { - g_warn_if_fail (info != NULL); + g_warn_if_fail (info == NULL); g_warning ("%s: %s", G_STRFUNC, local_error->message); g_error_free (local_error); + receive_done (send_info); + /* CamelFolderInfo may be NULL even if no error occurred. */ } else if (info != NULL) { GPtrArray *folders = g_ptr_array_new (); |