[cheese] Use g_clear_object() to clear GObject pointers

[David King <davidk src gnome org>]

commit 6f7d11e14f430dda39b0cd9660fe01fac97e23a0
Author: David King <amigadave amigadave com>
Date:   Tue Jan 10 22:30:02 2012 +0100

    Use g_clear_object() to clear GObject pointers

 libcheese/cheese-avatar-chooser.c        |    6 +-----
 libcheese/cheese-camera-device-monitor.c |    6 +-----
 libcheese/cheese-camera.c                |    3 +--
 libcheese/cheese-flash.c                 |    6 +-----
 libcheese/cheese-widget.c                |   12 ++----------
 5 files changed, 6 insertions(+), 27 deletions(-)
---
diff --git a/libcheese/cheese-avatar-chooser.c b/libcheese/cheese-avatar-chooser.c
index 942ccf9..b0f2097 100644
--- a/libcheese/cheese-avatar-chooser.c
+++ b/libcheese/cheese-avatar-chooser.c
@@ -309,11 +309,7 @@ cheese_avatar_chooser_finalize (GObject *object)
 {
   CheeseAvatarChooserPrivate *priv = ((CheeseAvatarChooser *) object)->priv;
 
-  if (priv->flash != NULL)
-  {
-    g_object_unref (priv->flash);
-    priv->flash = NULL;
-  }
+  g_clear_object (&priv->flash);
 
   G_OBJECT_CLASS (cheese_avatar_chooser_parent_class)->finalize (object);
 }
diff --git a/libcheese/cheese-camera-device-monitor.c b/libcheese/cheese-camera-device-monitor.c
index 9c5fd71..a0c6e82 100644
--- a/libcheese/cheese-camera-device-monitor.c
+++ b/libcheese/cheese-camera-device-monitor.c
@@ -376,11 +376,7 @@ cheese_camera_device_monitor_finalize (GObject *object)
 #ifdef HAVE_UDEV
   CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR (object)->priv;
 
-  if (priv->client != NULL)
-  {
-    g_object_unref (priv->client);
-    priv->client = NULL;
-  }
+  g_clear_object (&priv->client);
 #endif /* HAVE_UDEV */
   G_OBJECT_CLASS (cheese_camera_device_monitor_parent_class)->finalize (object);
 }
diff --git a/libcheese/cheese-camera.c b/libcheese/cheese-camera.c
index 13b83ca..42d22c8 100644
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@ -1187,8 +1187,7 @@ cheese_camera_finalize (GObject *object)
   /* Free CheeseCameraDevice array */
   g_ptr_array_free (priv->camera_devices, TRUE);
 
-  if (priv->monitor != NULL)
-    g_object_unref (priv->monitor);
+  g_clear_object (&priv->monitor);
 
   G_OBJECT_CLASS (cheese_camera_parent_class)->finalize (object);
 }
diff --git a/libcheese/cheese-flash.c b/libcheese/cheese-flash.c
index d60174e..5b7addc 100644
--- a/libcheese/cheese-flash.c
+++ b/libcheese/cheese-flash.c
@@ -256,11 +256,7 @@ cheese_flash_dispose (GObject *object)
 {
   CheeseFlashPrivate *priv = CHEESE_FLASH (object)->priv;
 
-  if (priv->parent != NULL)
-  {
-    g_object_unref (priv->parent);
-    priv->parent = NULL;
-  }
+  g_clear_object (&priv->parent);
 
   if (G_OBJECT_CLASS (cheese_flash_parent_class)->dispose)
     G_OBJECT_CLASS (cheese_flash_parent_class)->dispose (object);
diff --git a/libcheese/cheese-widget.c b/libcheese/cheese-widget.c
index df04da9..90bc7c6 100644
--- a/libcheese/cheese-widget.c
+++ b/libcheese/cheese-widget.c
@@ -249,16 +249,8 @@ cheese_widget_finalize (GObject *object)
 {
   CheeseWidgetPrivate *priv = ((CheeseWidget *) object)->priv;
 
-  if (priv->settings)
-  {
-    g_object_unref (priv->settings);
-    priv->settings = NULL;
-  }
-  if (priv->webcam)
-  {
-    g_object_unref (priv->webcam);
-    priv->webcam = NULL;
-  }
+  g_clear_object (&priv->settings);
+  g_clear_object (&priv->webcam);
 
   G_OBJECT_CLASS (cheese_widget_parent_class)->finalize (object);
 }