[f-spot] rehook ctrl-q

[Stephane Delcroix <sdelcroix src gnome org>]

commit cc39d12db37ffa1223e0b651b4e18ddd4b9c6253
Author: Stephane Delcroix <stephane delcroix org>
Date:   Sun Jul 26 14:47:19 2009 +0200

    rehook ctrl-q
    
    this fixes bgo 589605

 src/MainWindow.cs     |    2 ++
 src/ui/main_window.ui |   13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/src/MainWindow.cs b/src/MainWindow.cs
index ab99a47..ac5dd98 100644
--- a/src/MainWindow.cs
+++ b/src/MainWindow.cs
@@ -514,6 +514,8 @@ public class MainWindow {
 		export.Activated += HandleExportActivated;
 		UpdateToolbar ();
 
+		(uimanager.GetWidget("/ui/menubar1/file1/close1") as MenuItem).Hide ();
+
 		Banshee.Kernel.Scheduler.Resume ();
 	}
 
diff --git a/src/ui/main_window.ui b/src/ui/main_window.ui
index c04452c..b165189 100644
--- a/src/ui/main_window.ui
+++ b/src/ui/main_window.ui
@@ -83,13 +83,21 @@
         </child>
         <child>
           <object class="GtkAction" id="close1">
-            <property name="stock_id">gtk-quit</property>
+            <property name="stock_id">gtk-close</property>
             <property name="name">close1</property>
+            <property name="label" translatable="yes">_Close</property>
+            <signal handler="HandleCloseCommand" name="activate"/>
+          </object>
+          <accelerator key="w" modifiers="GDK_CONTROL_MASK"/>
+        </child>
+        <child>
+          <object class="GtkAction" id="quit">
+            <property name="stock_id">gtk-quit</property>
+            <property name="name">quit</property>
             <property name="label" translatable="yes">_Quit</property>
             <signal handler="HandleCloseCommand" name="activate"/>
           </object>
           <accelerator key="q" modifiers="GDK_CONTROL_MASK"/>
-          <accelerator key="w" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="edit2">
@@ -572,6 +580,7 @@
           <menuitem action="send_mail"/>
           <separator/>
           <menuitem action="close1"/>
+          <menuitem action="quit"/>
         </menu>
         <menu action="edit2">
           <menuitem action="copy_location"/>