aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ChangeLog8
-rw-r--r--ui/evolution-mail-message.xml60
2 files changed, 8 insertions, 60 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 055f844c34..c2c86ed850 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-11 Anna Marie Dirks <anna@ximian.com>
+
+ * evolution-mail-message.xml: doh. In my previous commit, a whole bunch
+ of changes that were supposed to be kept in my personal evo were added
+ to HEAD. (Mainly, this was the addition of a "Search" menu.) I am
+ reverting the wrong parts of that patch, and am committing only the
+ accelerators which that patch was supposed to add. Sorry.
+
2002-03-08 Radek Doulik <rodo@ximian.com>
* evolution-signature-editor.xml: added FormatHTML
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 847af8f541..f6d51a31cb 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -167,31 +167,6 @@
<cmd name="ToolsVFolderSubject"
_tip="Create a virtual folder for this subject"/>
- <cmd name="SearchVFolderSearch"
- _tip="Create a virtual folder based on this search"/>
-
- <cmd name="SearchSaveSearch"
- _tip="Save this search"/>
-
- <cmd name="SearchClearSearch"
- _tip="Erase the current search"
- accel="*Control**Shift*B"/>
-
- <cmd name="SearchSearch"
- _tip="Search through the messages in this folder"
- accel="*Control*B"/>
-
- <cmd name="SearchAdvancedSearch"
- _tip="Design an advanced search to run on the messages in this folder"/>
-
- <cmd name="SearchSavedSearches"
- _tip="Saved Searches"/>
-
- <cmd name="SearchEditSavedSearches"
- _tip="Edit Saved Searches"/>
-
-
-
<cmd name="ViewFullHeaders"
_tip="Show message with all email headers"
type="radio" group="message_display"/>
@@ -351,35 +326,6 @@
</placeholder>
</placeholder>
</submenu>
-
- <placeholder name="ComponentSearchPlaceholder">
- <submenu name="Search" _label="_Search">
- <placeholder name="ComponentPlaceholder">
-
- <menuitem name="SearchSearch" verb="" _label="_Find Now"/>
- <menuitem name="SearchClearSearch" verb="" _label="_Clear Search"/>
- <menuitem name="SearchAdvancedSearch" verb="" _label="_Advanced Search..."/>
-
-
- <separator f="" name="storesearch"/>
-
- <menuitem name="SeachSaveSearch" verb="" _label="_Save Search..."/>
- <menuitem name="SeachEditSavedSearches" verb="" _label="_Edit Saved Searches..."/>
-
- <separator f="" name="vfoldersearch"/>
-
- <menuitem name="SearchVFolderSearch" _label="Create _Virtual Folder From Search..."/>
-
- <separator f="" name="savedsearches"/>
-
- <menuitem name="SeachEditSavedSearches" verb="" _label="Family Mail"/>
- <menuitem name="SeachEditSavedSearches" verb="" _label="Sue's Phone"/>
-
-
- </placeholder>
- </submenu>
- </placeholder>
-
</menu>
<dockitem name="Toolbar">
@@ -430,9 +376,3 @@
</dockitem>
</Root>
-
-
-
-
-
-