[gnome-online-accounts] Use g_clear_object wherever applicable

[Debarshi Ray <debarshir src gnome org>]

commit f539156f8745c33a3e2f374c2962bfbee9878251
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Jan 22 16:27:07 2016 +0100

    Use g_clear_object wherever applicable

 src/daemon/main.c                            |    8 +++-----
 src/goa/goaclient.c                          |    3 +--
 src/goabackend/goaexchangeprovider.c         |   24 ++++++++----------------
 src/goabackend/goaoauth2provider.c           |    6 ++----
 src/goabackend/goaoauthprovider.c            |   12 ++++--------
 src/goaidentity/goakerberosidentitymanager.c |    6 ++----
 6 files changed, 20 insertions(+), 39 deletions(-)
---
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 8a935c5..65fb47d 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * Copyright (C) 2011 Red Hat, Inc.
+ * Copyright (C) 2011, 2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -137,11 +137,9 @@ main (int    argc,
   ret = 0;
 
  out:
-  if (the_daemon != NULL)
-    g_object_unref (the_daemon);
+  g_clear_object (&the_daemon);
 #ifdef GOA_TELEPATHY_ENABLED
-  if (tp_linker != NULL)
-    g_object_unref (tp_linker);
+  g_clear_object (&tp_linker);
 #endif
   if (name_owner_id != 0)
     g_bus_unown_name (name_owner_id);
diff --git a/src/goa/goaclient.c b/src/goa/goaclient.c
index 5309bd3..6a5ceb3 100644
--- a/src/goa/goaclient.c
+++ b/src/goa/goaclient.c
@@ -434,8 +434,7 @@ goa_client_get_manager (GoaClient *self)
   manager = goa_object_peek_manager (GOA_OBJECT (object));
 
  out:
-  if (object != NULL)
-    g_object_unref (object);
+  g_clear_object (&object);
   return manager;
 }
 
diff --git a/src/goabackend/goaexchangeprovider.c b/src/goabackend/goaexchangeprovider.c
index fcf7d2f..9efea52 100644
--- a/src/goabackend/goaexchangeprovider.c
+++ b/src/goabackend/goaexchangeprovider.c
@@ -245,16 +245,11 @@ build_object (GoaProvider         *provider,
   ret = TRUE;
 
  out:
-  if (exchange != NULL)
-    g_object_unref (exchange);
-  if (contacts != NULL)
-    g_object_unref (contacts);
-  if (calendar != NULL)
-    g_object_unref (calendar);
-  if (mail != NULL)
-    g_object_unref (mail);
-  if (password_based != NULL)
-    g_object_unref (password_based);
+  g_clear_object (&exchange);
+  g_clear_object (&contacts);
+  g_clear_object (&calendar);
+  g_clear_object (&mail);
+  g_clear_object (&password_based);
   return ret;
 }
 
@@ -332,8 +327,7 @@ ensure_credentials_sync (GoaProvider         *provider,
   ret = TRUE;
 
  out:
-  if (ews_client != NULL)
-    g_object_unref (ews_client);
+  g_clear_object (&ews_client);
   g_free (username);
   g_free (password);
   return ret;
@@ -738,8 +732,7 @@ add_account (GoaProvider    *provider,
   if (data.loop != NULL)
     g_main_loop_unref (data.loop);
   g_clear_object (&data.cancellable);
-  if (ews_client != NULL)
-    g_object_unref (ews_client);
+  g_clear_object (&ews_client);
   return ret;
 }
 
@@ -893,8 +886,7 @@ refresh_account (GoaProvider    *provider,
   if (data.loop != NULL)
     g_main_loop_unref (data.loop);
   g_clear_object (&data.cancellable);
-  if (ews_client != NULL)
-    g_object_unref (ews_client);
+  g_clear_object (&ews_client);
   return ret;
 }
 
diff --git a/src/goabackend/goaoauth2provider.c b/src/goabackend/goaoauth2provider.c
index db086da..57ee962 100644
--- a/src/goabackend/goaoauth2provider.c
+++ b/src/goabackend/goaoauth2provider.c
@@ -764,10 +764,8 @@ get_tokens_sync (GoaOAuth2Provider  *provider,
   g_clear_error (&tokens_error);
   g_free (ret_access_token);
   g_free (ret_refresh_token);
-  if (call != NULL)
-    g_object_unref (call);
-  if (proxy != NULL)
-    g_object_unref (proxy);
+  g_clear_object (&call);
+  g_clear_object (&proxy);
   return ret;
 }
 
diff --git a/src/goabackend/goaoauthprovider.c b/src/goabackend/goaoauthprovider.c
index 47e2711..9899c39 100644
--- a/src/goabackend/goaoauthprovider.c
+++ b/src/goabackend/goaoauthprovider.c
@@ -603,10 +603,8 @@ get_tokens_sync (GoaOAuthProvider  *provider,
   g_free (ret_access_token);
   g_free (ret_access_token_secret);
   g_free (ret_session_handle);
-  if (call != NULL)
-    g_object_unref (call);
-  if (proxy != NULL)
-    g_object_unref (proxy);
+  g_clear_object (&call);
+  g_clear_object (&proxy);
   return ret;
 }
 
@@ -911,8 +909,7 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
   ret = TRUE;
 
  out:
-  if (call != NULL)
-    g_object_unref (call);
+  g_clear_object (&call);
 
   if (ret)
     {
@@ -956,8 +953,7 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
   g_free (data.request_token_secret);
 
   g_strfreev (request_params);
-  if (proxy != NULL)
-    g_object_unref (proxy);
+  g_clear_object (&proxy);
   return ret;
 }
 
diff --git a/src/goaidentity/goakerberosidentitymanager.c b/src/goaidentity/goakerberosidentitymanager.c
index 162cf3f..aa2656f 100644
--- a/src/goaidentity/goakerberosidentitymanager.c
+++ b/src/goaidentity/goakerberosidentitymanager.c
@@ -988,8 +988,7 @@ on_job_scheduled (GIOSchedulerJob            *job,
         {
           g_simple_async_result_take_error (operation->result, error);
           g_simple_async_result_complete_in_idle (operation->result);
-          g_object_unref (operation->result);
-          operation->result = NULL;
+          g_clear_object (&operation->result);
           continue;
         }
 
@@ -1048,8 +1047,7 @@ on_job_scheduled (GIOSchedulerJob            *job,
       if (operation->result != NULL)
         {
           g_simple_async_result_complete_in_idle (operation->result);
-          g_object_unref (operation->result);
-          operation->result = NULL;
+          g_clear_object (&operation->result);
         }
       operation_free (operation);