[geary/mjog/931-cannot-remove-accounts: 4/5] Accounts.Manager: Fix criticals when removing/restoring accounts




commit b3aa2052cf61df97b8f2556b85141c69e7afa83b
Author: Michael Gratton <mike vee net>
Date:   Thu Aug 20 11:35:39 2020 +1000

    Accounts.Manager: Fix criticals when removing/restoring accounts
    
    Cancellables must be nullable.

 src/client/accounts/accounts-manager.vala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/client/accounts/accounts-manager.vala b/src/client/accounts/accounts-manager.vala
index c0ead2bbf..f9c2bdffd 100644
--- a/src/client/accounts/accounts-manager.vala
+++ b/src/client/accounts/accounts-manager.vala
@@ -306,7 +306,7 @@ public class Accounts.Manager : GLib.Object {
      * restore_account}.
      */
     public async void remove_account(Geary.AccountInformation account,
-                                     GLib.Cancellable cancellable)
+                                     GLib.Cancellable? cancellable)
         throws GLib.Error {
         this.accounts.unset(account.id);
         this.removed.add(account);
@@ -324,7 +324,7 @@ public class Accounts.Manager : GLib.Object {
      * he account was removed.
      */
     public async void restore_account(Geary.AccountInformation account,
-                                      GLib.Cancellable cancellable)
+                                      GLib.Cancellable? cancellable)
         throws GLib.Error {
         if (this.removed.remove(account)) {
             yield save_account(account, cancellable);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]