[gnome-software/wip/temp/ubuntu-xenial-rebased: 259/326] Only store macaroon when requested

[Iain Lane <iainl src gnome org>]

commit 75a5eabe7bf0e9663f3bc1e59cb8f29afe5da004
Author: William Hua <william hua canonical com>
Date:   Sun Apr 17 20:51:45 2016 -0400

    Only store macaroon when requested

 src/plugins/gs-ubuntuone.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/plugins/gs-ubuntuone.c b/src/plugins/gs-ubuntuone.c
index 29165e8..a0907fe 100644
--- a/src/plugins/gs-ubuntuone.c
+++ b/src/plugins/gs-ubuntuone.c
@@ -165,7 +165,7 @@ gs_ubuntuone_get_macaroon (gboolean   use_cache,
                g_mutex_clear (&login_context.mutex);
                g_cond_clear (&login_context.cond);
 
-               if (login_context.macaroon) {
+               if (login_context.macaroon != NULL && login_context.remember) {
                        printed = g_variant_print (login_context.macaroon, FALSE);
 
                        if (!secret_password_store_sync (&schema,