[gnome-online-accounts] provider: Avoid an extra CRITICAL

[Debarshi Ray <debarshir src gnome org>]

commit 5aff9a3e05a81a3b81a91ae723cff6cb1e479bc5
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Apr 29 13:39:47 2016 +0200

    provider: Avoid an extra CRITICAL
    
    In case 'res' is not a valid GTask, then we can avoid an extra
    CRITICAL from the G_TASK cast by moving it after this line:
      g_return_if_fail (g_task_is_valid (...) ...)
    
    https://bugzilla.gnome.org/show_bug.cgi?id=764157

 src/goabackend/goaprovider.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 6241009..c1498c1 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -737,7 +737,7 @@ goa_provider_ensure_credentials_finish (GoaProvider         *self,
                                         GAsyncResult        *res,
                                         GError             **error)
 {
-  GTask *task = G_TASK (res);
+  GTask *task;
   gboolean had_error;
 
   gboolean ret;
@@ -746,9 +746,11 @@ goa_provider_ensure_credentials_finish (GoaProvider         *self,
   ret = FALSE;
 
   g_return_val_if_fail (GOA_IS_PROVIDER (self), FALSE);
-  g_return_val_if_fail (g_task_is_valid (res, self), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
+  g_return_val_if_fail (g_task_is_valid (res, self), FALSE);
+  task = G_TASK (res);
+
   g_warn_if_fail (g_task_get_source_tag (task) == goa_provider_ensure_credentials);
 
   /* Workaround for bgo#764163 */
@@ -1224,13 +1226,16 @@ goa_provider_get_all_finish (GList        **out_providers,
                              GAsyncResult  *result,
                              GError       **error)
 {
-  GTask *task = G_TASK (result);
+  GTask *task;
   GList *providers;
   gboolean had_error;
 
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
   g_return_val_if_fail (g_task_is_valid (result, NULL), FALSE);
+  task = G_TASK (result);
+
   g_return_val_if_fail (g_task_get_source_tag (task) == goa_provider_get_all, FALSE);
-  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
   /* Workaround for bgo#764163 */
   had_error = g_task_had_error (task);