From 571af5c2d796f8a0fdd90eff64bd9559c45918c9 Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Thu, 23 Apr 2009 18:01:04 +0000
Subject: [PATCH] Rename the local variable to not shadow the global
 ui_description.

---
 desmume/src/gtk/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp
index baa631b65..68d6fd780 100644
--- a/desmume/src/gtk/main.cpp
+++ b/desmume/src/gtk/main.cpp
@@ -1707,10 +1707,10 @@ static Uint32 fps_limiter_fn(Uint32 interval, void *param)
   return interval;
 }
 
-static void desmume_try_adding_ui(GtkUIManager *self, const char *ui_description){
+static void desmume_try_adding_ui(GtkUIManager *self, const char *ui_descr){
     GError *error;
     error = NULL;
-    if (!gtk_ui_manager_add_ui_from_string (self, ui_description, -1, &error))
+    if (!gtk_ui_manager_add_ui_from_string (self, ui_descr, -1, &error))
       {
         g_message ("building menus failed: %s", error->message);
         g_error_free (error);