[gnome-online-accounts/gnome-3-16] kerberos: Fix ensure credentials when identity isn't yet known

[Debarshi Ray <debarshir src gnome org>]

commit 9f757a85461d5a62baad69a33ae1829c9ae641bf
Author: Ray Strode <rstrode redhat com>
Date:   Fri May 29 12:13:37 2015 -0400

    kerberos: Fix ensure credentials when identity isn't yet known
    
    An identity look up failure isn't actually a fatal failure when
    ensuring credentials. We handle a NULL identity fine.
    
    This commit changes the code to ignore identity look up failures
    when ensuring credentials.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=693578

 src/goabackend/goakerberosprovider.c |   11 +----------
 telepathy-account-widgets            |    2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/src/goabackend/goakerberosprovider.c b/src/goabackend/goakerberosprovider.c
index d7740b2..230d235 100644
--- a/src/goabackend/goakerberosprovider.c
+++ b/src/goabackend/goakerberosprovider.c
@@ -1749,21 +1749,12 @@ on_identity_looked_up_to_ensure_credentials (GoaKerberosProvider *self,
 {
 
   GoaIdentityServiceIdentity *identity;
-  GError                     *error;
+  GError                     *error = NULL;
   GoaObject                  *object;
   GoaAccount                 *account;
   const char                 *identifier;
   GCancellable               *cancellable;
 
-  error = NULL;
-  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), &error))
-    {
-      g_simple_async_result_take_error (operation_result, error);
-      g_simple_async_result_complete_in_idle (operation_result);
-      g_object_unref (operation_result);
-      return;
-    }
-
   identity = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result));
 
   if (identity != NULL && goa_identity_service_identity_get_is_signed_in (identity))
diff --git a/telepathy-account-widgets b/telepathy-account-widgets
index 7d18ae5..b838c54 160000
--- a/telepathy-account-widgets
+++ b/telepathy-account-widgets
@@ -1 +1 @@
-Subproject commit 7d18ae504fb5fa6b3ee0cd8e0c86da2e46ab24e1
+Subproject commit b838c54c673165a9d948b18f21580a0ca94f8cd5