Do ignore empty recipients when checking names

[modest] / src / hildon2 / ui / modest-main-window-ui.xml

diff --git a/src/hildon2/ui/modest-main-window-ui.xml b/src/hildon2/ui/modest-main-window-ui.xml
index 250f3ea..43730ab 100644 (file)
--- a/src/hildon2/ui/modest-main-window-ui.xml
+++ b/src/hildon2/ui/modest-main-window-ui.xml
@@ -33,13 +33,8 @@
   <menubar name="MenuBar">
     
     <menu name="EmailMenu" action="Email">
-      <menu name="EmailNewMainMenu" action="EmailNew">
-       <menuitem name="EmailNewMessageMenu"  action="EmailNewMessage"/>
-       <menuitem name="EmailNewFolderMenu" action="EmailNewFolder"/>
-      </menu>
-      <menuitem name="EmailOpenMenu" action="EmailOpen"/>
+      <menuitem name="EmailNewFolderMenu" action="EmailNewFolder"/>
       <separator/>
-      <menuitem name="EmailReplyMenu" action="EmailReply"/>
       <menuitem name="EmailReplyAllMenu" action="EmailReplyAll"/>
       <menuitem name="EmailForwardMenu" action="EmailForward"/>
       <separator/>
@@ -47,33 +42,24 @@
       <menuitem name="EmailPurgeAttachmentsMenu" action="EmailPurgeAttachments"/>
       <separator/>
       <menuitem name="EmailRenameMenu" action="EmailRenameFolder"/>
-      <menuitem name="EmailDeleteMenu" action="EmailDelete"/>
       <separator/>
       <menuitem name="EmailDetailsMenu" action="EmailDetails"/>
     </menu>
-    
+
     <menu name="EditMenu" action="Edit">
-<!--       <menuitem name="EditCutMenu" action="EditCut"/> -->
-<!--       <menuitem name="EditCopyMenu" action="EditCopy"/> -->
-<!--       <menuitem name="EditPasteMenu" action="EditPaste"/> -->
-<!--       <separator/> -->
       <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
       <menuitem name="EditMarkAsReadMenu" action="EditMarkAsRead"/>
       <menuitem name="EditMarkAsUnreadMenu" action="EditMarkAsUnread"/>
       <separator/>
       <menuitem name="EditMoveToMenu" action="EditMoveTo"/>
-    </menu> 
+    </menu>
 
-    <menu name="ViewMenu" action="View">
-      <menuitem name="ViewSortMenu" action="ViewSort"/>
-      <separator/>
-      <menuitem name="ViewToggleFoldersMenu" action="ToggleFolders"/>
-      <separator/>
-      <placeholder name="ViewMenuAdditions" />
+    <menu name="AccountsMenu" action="Accounts">
+      <placeholder name="AccountsMenuAdditions" />
    </menu>
-    
+
     <menu name="ToolsMenu" action="Tools">
-      <menuitem name="ToolsSettingsMenu" action="ToolsSettings"/>   
+      <menuitem name="ToolsSettingsMenu" action="ToolsSettings"/>
       <menuitem name="ToolsAccountsMenu" action="ToolsAccounts"/>
       <menuitem name="ToolsSMTPServersMenu" action="ToolsSMTPServers"/>
       <separator/>
@@ -85,9 +71,6 @@
       </menu>
       <separator/>
       <menuitem name="ToolsContactsMenu" action="ToolsContacts"/>
-      <menuitem name="ToolsSearchMessagesMenu" action="ToolsSearchMessages"/>
-      <separator/>
-      <menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
     </menu>
     
   </menubar>
@@ -103,32 +86,6 @@
     <toolitem action="ToolbarCancel" position="bot"/>
   </toolbar>
 
-  <popup name="HeaderViewCSM">
-    <menuitem action="HeaderViewCSMReply"/>
-    <menuitem action="HeaderViewCSMReplyAll"/>
-    <menuitem action="HeaderViewCSMForward"/>
-    <menuitem action="HeaderViewCSMCancelSending"/>
-<!--     <separator/> -->
-<!--     <menuitem action="HeaderViewCSMCut"/> -->
-<!--     <menuitem action="HeaderViewCSMCopy"/> -->
-<!--     <menuitem action="HeaderViewCSMPaste"/> -->
-    <separator/>
-    <menuitem action="HeaderViewCSMDelete"/>
-    <menuitem action="HeaderViewCSMHelp"/>
-  </popup>
-
-  <popup name="FolderViewCSM">
-    <menuitem action="FolderViewCSMNewFolder"/>
-    <menuitem action="FolderViewCSMRenameFolder"/>
-    <menuitem action="FolderViewCSMDeleteFolder"/>
-    <separator/>
-<!--    <menuitem action="FolderViewCSMPasteMsgs"/> -->
-    <separator/>
-    <separator/>
-    <menuitem action="FolderViewCSMSearchMessages"/>
-    <menuitem action="FolderViewCSMHelp"/>
-  </popup>
-
   <popup name="ToolbarReplyCSM" action="ToolbarCSM">
     <menuitem action="ToolbarMessageForward"/>
     <menuitem action="ToolbarMessageReplyAll"/>