From d73e96a238411e2404fc5e9938ac0fb8d441ecc4 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Mon, 20 Aug 2001 20:01:15 +0000
Subject: Move the ChangeFolderProperties into the ComponentPlaceholder. Add a

* evolution-mail-list.xml: Move the ChangeFolderProperties into
the ComponentPlaceholder.  Add a separator on the top.

* evolution.xml: Remove the separator above the component
placeholder here.

* folder-browser-ui.c (folder_browser_setup_property_menu):
Updated as ChangeFolderProperties is now in the
ComponentPlaceholder.

svn path=/trunk/; revision=12323
---
 mail/ChangeLog             | 6 ++++++
 mail/folder-browser-ui.c   | 2 +-
 ui/ChangeLog               | 8 ++++++++
 ui/evolution-mail-list.xml | 2 ++
 ui/evolution.xml           | 2 --
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 301c02c8a8..3f894003b7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
+
+	* folder-browser-ui.c (folder_browser_setup_property_menu):
+	Updated as ChangeFolderProperties is now in the
+	ComponentPlaceholder.
+
 2001-08-20  Peter Williams  <peterw@ximian.com>
 
 	* mail-accounts.c (mail_able): Whoops, make sure that the account
diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c
index 5256952321..53b5923936 100644
--- a/mail/folder-browser-ui.c
+++ b/mail/folder-browser-ui.c
@@ -263,7 +263,7 @@ folder_browser_setup_property_menu (FolderBrowser *fb,
 		name = g_strdup (_("Properties"));
 
 	bonobo_ui_component_set_prop (
-		uic, "/menu/File/Folder/ChangeFolderProperties",
+		uic, "/menu/File/Folder/ComponentPlaceholder/ChangeFolderProperties",
 		"label", name, NULL);
 	g_free (name);
 }
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 15b3ab67cf..5802e6fb49 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-20  Ettore Perazzoli  <ettore@ximian.com>
+
+	* evolution-mail-list.xml: Move the ChangeFolderProperties into
+	the ComponentPlaceholder.  Add a separator on the top.
+
+	* evolution.xml: Remove the separator above the component
+	placeholder here.
+
 2001-08-20  JP Rosevear  <jpr@ximian.com>
 
 	* evolution-comp-editor.xml: control-return for save and close
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 070a3de221..9e91695697 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -68,7 +68,9 @@
 
     <submenu name="File">
       <submenu name="Folder" _label="_Folder">
+	<placeholder name="ComponentPlaceholder">
          <menuitem name="ChangeFolderProperties" verb="" _label="_Properties..."/>
+	</placeholder>
       </submenu>
     </submenu>
 
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 2b90419af8..78636e9501 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -96,8 +96,6 @@
                   _label="Add to _Shortcut Bar"
                   _tip="Create a link to this folder in the shortcut bar"/>
         
-        <separator/>
-
         <placeholder name="ComponentPlaceholder"
                      delimit="top"/>
 
-- 
cgit