pidgin/pidgin

libsecret-keyring: Actually use GCancellable

2016-10-16, Mike Ruprecht
1d2a3de5feed
Parents 8be2e7b22d1e
Children 671723ed2a42
libsecret-keyring: Actually use GCancellable
1 files changed, 7 insertions(+), 4 deletions(-)
  • +7 -4
    libpurple/plugins/keyrings/secretservice.c
    • --- a/libpurple/plugins/keyrings/secretservice.c Sat Sep 24 11:40:18 2016 -0500
    +++ b/libpurple/plugins/keyrings/secretservice.c Sun Oct 16 21:46:51 2016 -0500
    @@ -169,7 +169,8 @@
    storage->cb = cb;
    storage->user_data = data;
    - secret_password_lookup(&purple_schema, NULL, ss_read_continue, storage,
    + secret_password_lookup(&purple_schema, keyring_cancellable,
    + ss_read_continue, storage,
    "user", purple_account_get_username(account),
    "protocol", purple_account_get_protocol_id(account), NULL);
    }
    @@ -240,7 +241,8 @@
    label = g_strdup_printf(_("Pidgin IM password for account %s"), username);
    secret_password_store(&purple_schema, SECRET_COLLECTION_DEFAULT,
    - label, password, NULL, ss_store_continue, storage,
    + label, password, keyring_cancellable,
    + ss_store_continue, storage,
    "user", username,
    "protocol", purple_account_get_protocol_id(account),
    NULL);
    @@ -252,8 +254,9 @@
    purple_account_get_username(account),
    purple_account_get_protocol_id(account));
    - secret_password_clear(&purple_schema, NULL, ss_clear_continue,
    - storage, "user", purple_account_get_username(account),
    + secret_password_clear(&purple_schema, keyring_cancellable,
    + ss_clear_continue, storage,
    + "user", purple_account_get_username(account),
    "protocol", purple_account_get_protocol_id(account),
    NULL);
    }