[cheese/wip/hans-fixes-master: 4/16] Improve error handling in CheeseCamera

[David King <davidk src gnome org>]

commit 6f4127e8c72f48e427e5d94561cf055785c9b0fb
Author: Hans de Goede <hdegoede redhat com>
Date:   Mon Jun 10 10:39:16 2013 +0200

    Improve error handling in CheeseCamera
    
    Simplify error cleanup in cheese_camera_set_camera_source(). Do not call
    g_error_free() on a possible NULL error in
    cheese_camera_element_from_effect().
    
    Signed-off-by: Hans de Goede <hdegoede redhat com>

 libcheese/cheese-camera.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/libcheese/cheese-camera.c b/libcheese/cheese-camera.c
index 8a82406..8ac6511 100644
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@ -426,11 +426,7 @@ cheese_camera_set_camera_source (CheeseCamera *camera)
 
   if (priv->video_source == NULL)
   {
-    if (err != NULL)
-    {
-      g_error_free (err);
-      err = NULL;
-    }
+    g_clear_error(&err);
     return FALSE;
   }
 
@@ -868,7 +864,7 @@ cheese_camera_element_from_effect (CheeseCamera *camera, CheeseEffect *effect)
   g_free (effects_pipeline_desc);
   if (!effect_filter || (err != NULL))
   {
-    g_error_free (err);
+    g_clear_error (&err);
     g_warning ("Error with effect filter %s. Ignored", name);
     g_free (name);
     return NULL;