[cheese/wip/kill-gnome-common: 7/13] Fix shadowed variable

[David King <davidk src gnome org>]

commit b092dcda99816ca2924ec67e1d2ca18338a53fb1
Author: David King <amigadave amigadave com>
Date:   Thu Jan 29 10:16:10 2015 +0000

    Fix shadowed variable

 libcheese/cheese-flash.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libcheese/cheese-flash.c b/libcheese/cheese-flash.c
index ea4ce2b..8500acb 100644
--- a/libcheese/cheese-flash.c
+++ b/libcheese/cheese-flash.c
@@ -129,10 +129,10 @@ cheese_flash_set_property (GObject      *object,
   switch (prop_id)
   {
     case PROP_PARENT: {
-      GObject *object;
-      object = g_value_get_object (value);
+      GObject *parent;
+      parent = g_value_get_object (value);
       if (object != NULL)
-        priv->parent = g_object_ref (object);
+        priv->parent = g_object_ref (parent);
       else
         priv->parent = NULL;
     }