[gnome-online-accounts/gnome-3-18] identity: don't ignore almost all renewal requests

[Debarshi Ray <debarshir src gnome org>]

commit 816e35f9631cb9c869a46b244de4727400d01ed9
Author: Ray Strode <rstrode redhat com>
Date:   Tue Sep 22 14:38:29 2015 -0400

    identity: don't ignore almost all renewal requests
    
    There's a bug in the code where we ignore all renewal requests for
    objects we already know about.
    
    This means we'll only ever honor renewal requests that happen almost
    immediately after start up.
    
    This commit fixes the bug, so the only renewal requests that aren't
    honored, are those that have been specifically disabled by the user.
    This was clearly the original intention of the buggy code.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=756495

 src/goaidentity/goaidentityservice.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/goaidentity/goaidentityservice.c b/src/goaidentity/goaidentityservice.c
index 2b6c9ab..165dc2f 100644
--- a/src/goaidentity/goaidentityservice.c
+++ b/src/goaidentity/goaidentityservice.c
@@ -753,16 +753,17 @@ on_identity_needs_renewal (GoaIdentityManager *identity_manager,
 
   principal = goa_identity_get_identifier (identity);
 
-  g_debug ("GoaIdentityService: identity %s needs renewal", principal);
-
   object = find_object_with_principal (self, principal, TRUE);
 
-  if (object != NULL)
+  if (object != NULL && should_ignore_object (self, object))
     {
-      should_ignore_object (self, object);
+      g_debug ("GoaIdentityService: ignoring identity %s that says it needs renewal", principal);
+
       return;
     }
 
+  g_debug ("GoaIdentityService: identity %s needs renewal", principal);
+
   goa_identity_manager_renew_identity (GOA_IDENTITY_MANAGER
                                        (self->priv->identity_manager),
                                        identity,