From f01283e4af25128640187004588034b03015b5ff Mon Sep 17 00:00:00 2001
From: matusz <matusz@users.sf.net>
Date: Sat, 18 Apr 2009 13:33:15 +0000
Subject: [PATCH] glade port: rename 'ouvrir' elements to 'open'

---
 desmume/src/gtk-glade/callbacks.cpp       | 2 +-
 desmume/src/gtk-glade/callbacks.h         | 2 +-
 desmume/src/gtk-glade/glade/DeSmuMe.glade | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/desmume/src/gtk-glade/callbacks.cpp b/desmume/src/gtk-glade/callbacks.cpp
index 0464cc4a6..a879a2a1d 100755
--- a/desmume/src/gtk-glade/callbacks.cpp
+++ b/desmume/src/gtk-glade/callbacks.cpp
@@ -205,7 +205,7 @@ static void file_open() {
 	gtk_widget_destroy(pFileSelection);
 }
  
-void  on_menu_ouvrir_activate  (GtkMenuItem *menuitem, gpointer user_data) { file_open();}
+void  on_menu_open_activate  (GtkMenuItem *menuitem, gpointer user_data) { file_open();}
 void  on_menu_quit_activate    (GtkMenuItem *menuitem, gpointer user_data) { gtk_main_quit(); }
 
 #define SCREENS_PIXEL_SIZE 98304
diff --git a/desmume/src/gtk-glade/callbacks.h b/desmume/src/gtk-glade/callbacks.h
index 71928d835..7ba0a86f5 100755
--- a/desmume/src/gtk-glade/callbacks.h
+++ b/desmume/src/gtk-glade/callbacks.h
@@ -24,7 +24,7 @@
 extern "C" {
 
 /* MENU FILE */
-G_MODULE_EXPORT void  on_menu_ouvrir_activate  (GtkMenuItem *menuitem, gpointer user_data);
+G_MODULE_EXPORT void  on_menu_open_activate  (GtkMenuItem *menuitem, gpointer user_data);
 G_MODULE_EXPORT void  on_menu_pscreen_activate (GtkMenuItem *menuitem, gpointer user_data);
 G_MODULE_EXPORT void  on_menu_quit_activate    (GtkMenuItem *menuitem, gpointer user_data);
 
diff --git a/desmume/src/gtk-glade/glade/DeSmuMe.glade b/desmume/src/gtk-glade/glade/DeSmuMe.glade
index 54f51b27c..fd757a8c8 100755
--- a/desmume/src/gtk-glade/glade/DeSmuMe.glade
+++ b/desmume/src/gtk-glade/glade/DeSmuMe.glade
@@ -49,11 +49,11 @@
                 <widget class="GtkMenu" id="menu_file_menu">
 
                   <child>
-                    <widget class="GtkImageMenuItem" id="menu_ouvrir">
+                    <widget class="GtkImageMenuItem" id="menu_open">
                       <property name="visible">True</property>
                       <property name="label">gtk-open</property>
                       <property name="use_stock">True</property>
-                      <signal name="activate" handler="on_menu_ouvrir_activate" last_modification_time="Mon, 01 Jan 2007 16:34:54 GMT"/>
+                      <signal name="activate" handler="on_menu_open_activate" last_modification_time="Mon, 01 Jan 2007 16:34:54 GMT"/>
                     </widget>
                   </child>