[geary/cherry-pick-eccb432b] Merge branch 'wip/ricotz/error-check' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 02c6047a3006be926c72616da347628cb2f29d7c
Author: Michael Gratton <mike vee net>
Date:   Wed Nov 28 10:37:49 2018 +0000

    Merge branch 'wip/ricotz/error-check' into 'master'
    
    Actually use error variable to check for IOError.CANCELLED
    
    See merge request GNOME/geary!66
    
    (cherry picked from commit eccb432bbc7505f388820a0e310349e41ee5f3bb)
    
    088cb2c0 Actually use error variable to check for IOError.CANCELLED

 src/client/application/geary-controller.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index cca7fcb8..16693bbe 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -2520,7 +2520,7 @@ public class GearyController : Geary.BaseObject {
             yield do_empty_folder_async(emptyable, cancellable);
         } catch (Error err) {
             // don't report to user if cancelled
-            if (cancellable is IOError.CANCELLED)
+            if (err is IOError.CANCELLED)
                 return;
             
             ErrorDialog dialog = new ErrorDialog(main_window,