From 32477d4fbff400a235f501967492349ae44a475d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 19 Apr 2010 11:40:23 -0400
Subject: [PATCH] Another shadowed variable fix

See bug 616154.
---
 gio/gsettings.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gio/gsettings.c b/gio/gsettings.c
index f2428f97a..0326f0b5f 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -742,16 +742,16 @@ g_settings_get_value (GSettings   *settings,
   if (options != NULL)
     {
       GVariantIter iter;
-      const gchar *key;
+      const gchar *option;
       GVariant *option_value;
 
       g_variant_iter_init (&iter, options);
-      while (g_variant_iter_loop (&iter, "{&sv}", &key, &option_value))
+      while (g_variant_iter_loop (&iter, "{&sv}", &option, &option_value))
         {
-          if (strcmp (key, "l10n") == 0)
+          if (strcmp (option, "l10n") == 0)
             g_variant_get (option_value, "(y&s)", &lc_char, &unparsed);
           else
-            g_warning ("unknown schema extension '%s'", key);
+            g_warning ("unknown schema extension '%s'", option);
         }
     }