From 3a1dbfa0440d6472047685dfe3fc078e163ccfa6 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Thu, 9 Aug 2001 06:44:34 +0000
Subject: Put the "Tools" and "Actions" menus in the
 "ComponentToolsPlaceholder" and

* evolution-addressbook.xml: Put the "Tools" and "Actions" menus
in the "ComponentToolsPlaceholder" and
"ComponentActionsPlaceholder", respectively.
* evolution-calendar.xml: Likewise.
* evolution-contact-editor.xml: Likewise.
* evolution-mail-global.xml: Likewise.
* evolution-mail-message.xml: Likewise.

* evolution.xml: Remove "Tools" and "Actions" menus.  Create a
"ComponentActionsPlaceholder" and a "ComponentToolsPlaceholder"
instead.
* evolution-mail-messagedisplay.xml: Likewise, put "Tools" and
"Actions" in placeholders.

svn path=/trunk/; revision=11822
---
 ui/evolution-addressbook.xml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'ui/evolution-addressbook.xml')

diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index e38a778391..9696240938 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -95,30 +95,29 @@
 		</submenu>
 
 		<submenu name="View">
-
 		</submenu>
 
-		<submenu name="Tools" _label="_Tools">
-                        <placeholder name="Component">
+                <placeholder name="ComponentToolsPlaceholder">
+			<submenu name="Tools" _label="_Tools">
 				<menuitem name="ToolSearch" verb=""
-				_label="_Search for contacts"
-				pixtype="stock" pixname="Search" />
-	  
-	                        <menuitem name="AddressbookConfig" verb=""
-	                         _label="_Addressbook Sources..."
-	                         pixtype ="pixbuf"/>
-	                </placeholder>
-		</submenu>
-		<submenu name="Actions" _label="_Actions">
-                        <placeholder name="Component">
+				 _label="_Search for contacts"
+				 pixtype="stock" pixname="Search" />
+	        	        <menuitem name="AddressbookConfig" verb=""
+	        	         _label="_Addressbook Sources..."
+	        	         pixtype ="pixbuf"/>
+			</submenu>
+                <placeholder/>
+
+		<placeholder name="ComponentActionsPlaceholder">
+                        <submenu name="Actions" _label="_Actions">
 
 			    <menuitem name="ContactsSendContactToOther"
 			     _label="Send _contact to other" verb=""/>
 
 			    <menuitem name="ContactsSendMessageToContact"
 			     _label="Send _message to contact" verb=""/>
-	                </placeholder>
-		</submenu>
+	                </submenu>
+		</placeholder>
 	</menu>
 
 	<dockitem name="Toolbar">
-- 
cgit