* Fixes NB#96696, do not use -export-dynamic to reduce the symbols to be exported

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

diff --git a/src/gnome/ui/modest-main-window-ui.xml b/src/gnome/ui/modest-main-window-ui.xml
index 62368ad..817caba 100644 (file)
--- a/src/gnome/ui/modest-main-window-ui.xml
+++ b/src/gnome/ui/modest-main-window-ui.xml
@@ -90,15 +90,6 @@
     </menu>
 
 
-    <menu name="OptionsMenu" action="Options">
-      <menuitem name="OptionsAddToContactsMenu" action="OptionsAddToContacts"/>
-      <menuitem name="OptionsAccountsMenu" action="OptionsAccounts"/>
-      <separator/>
-      <menuitem name="OptionsContactsMenu" action="OptionsContacts"/>
-      <separator/>
-      <menuitem name="OptionsSettingsMenu" action="OptionsSettings"/>
-    </menu>
-
     <menu name="HelpMenu" action="Help">
       <menuitem name="HelpAboutMenu" action="HelpAbout"/>
     </menu>
@@ -121,16 +112,25 @@
 <!--     <toolitem name="ToggleView" action="ToggleView"/> -->
   </toolbar>
 
-  <popup name="HeaderViewContextMenu">
-    <menuitem action="ActionsReply"/>
-    <menuitem action="ActionsForward"/>
+  <popup name="HeaderViewCSM">
+    <menuitem action="HeaderViewCSMReply"/>
+    <menuitem action="HeaderViewCSMReplyAll"/>
+    <menuitem action="HeaderViewCSMForward"/>
+    <menuitem action="HeaderViewCSMCancelSending"/>
+    <separator/>
+    <menuitem action="HeaderViewCSMDelete"/>
+    <menuitem action="HeaderViewCSMHelp"/>
   </popup>
 
-  <popup name="FolderViewContextMenu">
-    <menuitem action="ActionsFolderNew"/>
-    <menuitem action="ActionsFolderDelete"/>
-    <menuitem action="ActionsFolderRename"/>
-    <menuitem action="ActionsFolderMoveToTrash"/>
+  <popup name="FolderViewCSM">
+    <menuitem action="FolderViewCSMNewFolder"/>
+    <menuitem action="FolderViewCSMRenameFolder"/>
+    <menuitem action="FolderViewCSMDeleteFolder"/>
+    <separator/>
+    <separator/>
+    <separator/>
+    <menuitem action="FolderViewCSMSearchMessages"/>
+    <menuitem action="FolderViewCSMHelp"/>
   </popup>
 
 </ui>