[geary: 2/2] Merge branch 'wip/285-cancelled-commands' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 54f5ec397e4f78d698271c70a2c807cd190f177b
Merge: ffe4775e 2c8a232f
Author: Michael Gratton <mike vee net>
Date:   Thu Mar 7 00:49:14 2019 +0000

    Merge branch 'wip/285-cancelled-commands' into 'master'
    
    Ensure that cancelled commands throw a cancelled error, not a timeout
    
    Closes #285
    
    See merge request GNOME/geary!167

 src/engine/imap/command/imap-command.vala | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
---