From 4dcf63be7fcc88640556a15fdde82d96c0a793d2 Mon Sep 17 00:00:00 2001
From: Sergio Villar Senin <svillar@igalia.com>
Date: Wed, 15 Oct 2008 17:01:27 +0000
Subject: [PATCH] 	* Fixes NB#90146, do not show the "Close" options in
 menus

pmo-trunk-r6054
---
 src/hildon2/ui/modest-main-window-ui.xml     |    4 ----
 src/hildon2/ui/modest-msg-edit-window-ui.xml |    4 ----
 src/hildon2/ui/modest-msg-view-window-ui.xml |    4 ----
 3 files changed, 12 deletions(-)

diff --git a/src/hildon2/ui/modest-main-window-ui.xml b/src/hildon2/ui/modest-main-window-ui.xml
index 11d1f7b..9d8c53a 100644
--- a/src/hildon2/ui/modest-main-window-ui.xml
+++ b/src/hildon2/ui/modest-main-window-ui.xml
@@ -96,10 +96,6 @@
       <menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
     </menu>
     
-    <menu name="CloseMenu" action="Close">
-      <menuitem name="CloseWindowMenu"     action="CloseWindow"/>
-      <menuitem name="CloseAllWindowsMenu" action="CloseAllWindows"/>
-    </menu>
   </menubar>
 
   <toolbar name="ToolBar">
diff --git a/src/hildon2/ui/modest-msg-edit-window-ui.xml b/src/hildon2/ui/modest-msg-edit-window-ui.xml
index 1386fba..149b3c2 100644
--- a/src/hildon2/ui/modest-msg-edit-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-edit-window-ui.xml
@@ -100,10 +100,6 @@
       <menuitem name="ToolsHelpMenu" action="Help"/>
     </menu>
 
-    <menu name="CloseMenu" action="Close">
-      <menuitem name="CloseWindowMenu" action="CloseWindow"/>
-      <menuitem name="CloseAllWindowsMenu" action="CloseAllWindows"/>
-    </menu>
   </menubar>
 
   <toolbar name="ToolBar">
diff --git a/src/hildon2/ui/modest-msg-view-window-ui.xml b/src/hildon2/ui/modest-msg-view-window-ui.xml
index 244140e..9ece723 100644
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-view-window-ui.xml
@@ -89,10 +89,6 @@
       <menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
    </menu>
 
-   <menu name="CloseMenu" action="Close">
-      <menuitem name="CloseWindowMenu"     action="CloseWindow"/>
-      <menuitem name="CloseAllWindowsMenu"     action="CloseAllWindows"/>
-    </menu>
   </menubar>
 
   <toolbar name="ToolBar">
-- 
1.7.9.5