[geary/geary-0.12: 2/2] Merge branch 'cherry-pick-eccb432b' into 'geary-0.12'

[Michael Gratton <mjog src gnome org>]

commit efca27c7c35d7c3cfcaf8e961c2499fad7f92a4b
Merge: 81babd14 02c6047a
Author: Michael Gratton <mike vee net>
Date:   Wed Nov 28 23:05:32 2018 +0000

    Merge branch 'cherry-pick-eccb432b' into 'geary-0.12'
    
    Actually use error variable to check for IOError.CANCELLED
    
    See merge request GNOME/geary!67

 src/client/application/geary-controller.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---