[gnome-online-accounts] media-server: Don't touch the keyring
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts] media-server: Don't touch the keyring
- Date: Mon, 9 May 2016 16:56:32 +0000 (UTC)
commit 2cf1c46f976b1f924c9b612f29dba30479e8b609
Author: Debarshi Ray <debarshir gnome org>
Date: Wed May 4 18:47:43 2016 +0200
media-server: Don't touch the keyring
Media servers (eg., DLNA) don't need any credentials, therefore don't
bother storing and looking up an empty entry in the keyring.
https://bugzilla.gnome.org/show_bug.cgi?id=688041
src/goabackend/goamediaserverprovider.c | 44 +-----------------------------
1 files changed, 2 insertions(+), 42 deletions(-)
---
diff --git a/src/goabackend/goamediaserverprovider.c b/src/goabackend/goamediaserverprovider.c
index 087f428..38468ca 100644
--- a/src/goabackend/goamediaserverprovider.c
+++ b/src/goabackend/goamediaserverprovider.c
@@ -174,35 +174,10 @@ ensure_credentials_sync (GoaProvider *provider,
GCancellable *cancellable,
GError **error)
{
- GVariant *credentials;
- gboolean ret;
-
- credentials = NULL;
- ret = FALSE;
-
- credentials = goa_utils_lookup_credentials_sync (provider,
- object,
- cancellable,
- error);
-
- if (credentials == NULL)
- {
- if (error != NULL)
- {
- (*error)->domain = GOA_ERROR;
- (*error)->code = GOA_ERROR_NOT_AUTHORIZED;
- goto out;
- }
- }
-
if (out_expires_in != NULL)
*out_expires_in = 0;
- ret = TRUE;
-
- out:
- g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
- return ret;
+ return TRUE;
}
/* ---------------------------------------------------------------------------------------------------- */
@@ -527,28 +502,13 @@ refresh_account (GoaProvider *provider,
GError **error)
{
GoaAccount *account;
- GVariantBuilder credentials;
- gboolean ret;
-
- ret = FALSE;
-
- g_variant_builder_init (&credentials, G_VARIANT_TYPE_VARDICT);
-
- if (!goa_utils_store_credentials_for_object_sync (provider,
- object,
- g_variant_builder_end (&credentials),
- NULL, /* GCancellable */
- error))
- goto out;
account = goa_object_peek_account (object);
goa_account_call_ensure_credentials (account,
NULL, /* GCancellable */
NULL, NULL); /* callback, user_data */
- ret = TRUE;
- out:
- return ret;
+ return TRUE;
}
/* ---------------------------------------------------------------------------------------------------- */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]