aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-04-24 21:07:46 +0800
committerMilan Crha <mcrha@redhat.com>2012-04-24 21:07:46 +0800
commit80ee0ba6227dea6d7638d39cbb2aacefba683d85 (patch)
tree6e7fe3841b165b5522f620bcea3cf215c370ea38 /widgets
parent60f07fd3509530c03d1cba98572efc9dbfc003b1 (diff)
downloadgsoc2013-evolution-80ee0ba6227dea6d7638d39cbb2aacefba683d85.tar
gsoc2013-evolution-80ee0ba6227dea6d7638d39cbb2aacefba683d85.tar.gz
gsoc2013-evolution-80ee0ba6227dea6d7638d39cbb2aacefba683d85.tar.bz2
gsoc2013-evolution-80ee0ba6227dea6d7638d39cbb2aacefba683d85.tar.lz
gsoc2013-evolution-80ee0ba6227dea6d7638d39cbb2aacefba683d85.tar.xz
gsoc2013-evolution-80ee0ba6227dea6d7638d39cbb2aacefba683d85.tar.zst
gsoc2013-evolution-80ee0ba6227dea6d7638d39cbb2aacefba683d85.zip
Bug #674062 - Runtime warning from e_attachment_load_handle_error()
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/e-attachment.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 31e0abf330..087c55f9c5 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -1941,7 +1941,7 @@ e_attachment_load_handle_error (EAttachment *attachment,
g_return_if_fail (E_IS_ATTACHMENT (attachment));
g_return_if_fail (G_IS_ASYNC_RESULT (result));
- g_return_if_fail (GTK_IS_WINDOW (parent));
+ g_return_if_fail (!parent || GTK_IS_WINDOW (parent));
if (e_attachment_load_finish (attachment, result, &error))
return;
@@ -1959,8 +1959,10 @@ e_attachment_load_handle_error (EAttachment *attachment,
}
/* Ignore cancellations. */
- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_error_free (error);
return;
+ }
file_info = e_attachment_get_file_info (attachment);