[totem] grilo: Fix some variable shadowing warnings from gcc

[Philip Withnall <pwithnall src gnome org>]

commit c47ce5f319d468e027b05c6eaae28c8f47c9f997
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Jul 9 13:28:42 2011 +0100

    grilo: Fix some variable shadowing warnings from gcc

 src/plugins/grilo/totem-grilo.c |   42 +++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/src/plugins/grilo/totem-grilo.c b/src/plugins/grilo/totem-grilo.c
index e7b764f..e04d262 100644
--- a/src/plugins/grilo/totem-grilo.c
+++ b/src/plugins/grilo/totem-grilo.c
@@ -182,36 +182,36 @@ get_description (GrlMedia *media)
 static GList *
 browse_keys (void)
 {
-	static GList *browse_keys = NULL;
-
-	if (browse_keys == NULL) {
-		browse_keys = grl_metadata_key_list_new (GRL_METADATA_KEY_ARTIST,
-		                                         GRL_METADATA_KEY_AUTHOR,
-		                                         GRL_METADATA_KEY_DURATION,
-		                                         GRL_METADATA_KEY_THUMBNAIL,
-		                                         GRL_METADATA_KEY_URL,
-		                                         GRL_METADATA_KEY_TITLE,
-		                                         NULL);
+	static GList *_browse_keys = NULL;
+
+	if (_browse_keys == NULL) {
+		_browse_keys = grl_metadata_key_list_new (GRL_METADATA_KEY_ARTIST,
+		                                          GRL_METADATA_KEY_AUTHOR,
+		                                          GRL_METADATA_KEY_DURATION,
+		                                          GRL_METADATA_KEY_THUMBNAIL,
+		                                          GRL_METADATA_KEY_URL,
+		                                          GRL_METADATA_KEY_TITLE,
+		                                          NULL);
 	}
 
-	return browse_keys;
+	return _browse_keys;
 }
 
 static GList *
 search_keys (void)
 {
-	static GList *search_keys = NULL;
-
-	if (search_keys == NULL) {
-		search_keys = grl_metadata_key_list_new (GRL_METADATA_KEY_ARTIST,
-		                                         GRL_METADATA_KEY_AUTHOR,
-		                                         GRL_METADATA_KEY_THUMBNAIL,
-		                                         GRL_METADATA_KEY_URL,
-		                                         GRL_METADATA_KEY_TITLE,
-		                                         NULL);
+	static GList *_search_keys = NULL;
+
+	if (_search_keys == NULL) {
+		_search_keys = grl_metadata_key_list_new (GRL_METADATA_KEY_ARTIST,
+		                                          GRL_METADATA_KEY_AUTHOR,
+		                                          GRL_METADATA_KEY_THUMBNAIL,
+		                                          GRL_METADATA_KEY_URL,
+		                                          GRL_METADATA_KEY_TITLE,
+		                                          NULL);
 	}
 
-	return search_keys;
+	return _search_keys;
 }
 
 static GdkPixbuf *