fix the mess with separators.

2000-10-09  Michael Meeks  <michael@helixcode.com>

	* fix the mess with separators.

svn path=/trunk/; revision=5796

7 files changed, 21 insertions, 17 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 2966f4eb5f..7e238253d0 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,9 @@
 2000-10-09  Michael Meeks  <michael@helixcode.com>
 
+	* fix the mess with separators.
+
+2000-10-09  Michael Meeks  <michael@helixcode.com>
+
 	* evolution-subscribe.xml: s/descr/tip/
 
 2000-10-05  Michael Meeks  <michael@helixcode.com>
diff --git a/ui/evolution-addressbook-ldap.xml b/ui/evolution-addressbook-ldap.xml
index cb8cf624be..6d4ff5b517 100644
--- a/ui/evolution-addressbook-ldap.xml
+++ b/ui/evolution-addressbook-ldap.xml
@@ -52,7 +52,7 @@
 		_tip="Create a new contact" verb="ContactNew"
 		pixtype="stock" pixname="New"/>
 
-		<toolitem type="separator"/>
+		<separator/>
 
 		<toolitem name="Find" _label="Find"
 		_tip="Find a contact" verb="ContactFind"
@@ -66,7 +66,7 @@
 		_tip="Delete a contact" verb="ContactDelete"
 		pixtype="stock" pixname="Trash"/>
 
-		<toolitem type="separator"/>
+		<separator/>
 
 		<control name="QuickSearch"/>
 
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index f4087e2f4d..000a38772e 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -41,7 +41,7 @@
 		_descr="Create a new contact" verb="ContactNew"
 		pixtype="stock" pixname="New"/>
 
-		<toolitem type="separator"/>
+		<separator/>
 
 		<toolitem name="Find" _label="Find"
 		_descr="Find a contact" verb="ContactFind"
@@ -55,7 +55,7 @@
 		_descr="Delete a contact" verb="ContactDelete"
 		pixtype="stock" pixname="Trash"/>
 
-		<toolitem type="separator"/>
+		<separator/>
 
 		<control name="QuickSearch"/>
 
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index c27b6f1214..54080b84e5 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -51,13 +51,13 @@
 		_tip="Create a new appointment" verb="EditNewAppointment"
 		pixtype="stock" pixname="New"/>
 
-		<toolitem type="separator"/>
+		<separator/>
 
 		<toolitem name="Print" _label="Print"
 		_tip="Print this calendar" verb="CalendarPrint"
 		pixtype="stock" pixname="Print"/>
 
-		<toolitem type="separator"/>
+		<separator/>
 
 		<toolitem name="Prev" label="Prev"
 		_tip="Go back in time" verb="CalendarPrev"
@@ -71,13 +71,13 @@
 		_tip="Go forward in time" verb="CalendarNext"
 		pixtype="stock" pixname="Forward"/>
 
-		<toolitem type="separator"/>
+		<separator/>
 
 		<toolitem name="Goto" label="Go to"
 		_tip="Go to a specific date" verb="CalendarGoto"
 		pixtype="stock" pixname="Jump To"/>
 		
-		<toolitem type="separator"/>
+		<separator/>
 
 	</dockitem>
 
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index 83411aa334..956481e807 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -186,13 +186,13 @@ static GnomeUIInfo main_menu[] = {
 			_label="Save _As"
 			pixtype="stock" pixname="Menu_SaveAs"/>
 
-			<menuitem type="separator"/>
+			<separator/>
 
 		        <menuitem name="Delete" verb="ContactEditorDelete"
 			_label="Delete"
 			pixtype="stock" pixname="Menu_Trash"/>
 
-			<menuitem type="separator"/>
+			<separator/>
 
 			<placeholder name="Print">
 
@@ -202,7 +202,7 @@ static GnomeUIInfo main_menu[] = {
 				
 			</placeholder>
 
-			<menuitem type="separator"/>
+			<separator/>
 
 		        <menuitem name="Close" verb="ContactEditorClose"
 			_label="Close"
@@ -216,7 +216,7 @@ static GnomeUIInfo main_menu[] = {
 		_tip="Save the contact and close the dialog box" verb="ContactEditorSaveClose"
 		pixtype="stock" pixname="Save"/>
 
-		<toolitem type="separator"/>
+		<separator/>
 
 		<toolitem name="Print" _label="Print..."
 		_tip="Print this item" verb="ContactEditorPrint"
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index c0962e977c..029edd01d6 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -159,7 +159,7 @@
     _label="Compose" _tip="Compose a new message"
     pixtype="pixbuf"/>
 
-    <toolitem type="separator"/>
+    <separator/>
 
     <toolitem name="Reply" verb="MessageReplySndr"
     _label="Reply" _tip="Reply to the sender of this message"
@@ -173,7 +173,7 @@
     _label="Forward" _tip="Forward this message"
     pixtype="pixbuf"/>
 
-    <toolitem type="separator"/>
+    <separator/>
 
     <toolitem name="Move" verb="MessageMove"
     _label="Move" _tip="Move message to a new folder"
@@ -183,7 +183,7 @@
     _label="Copy" _tip="Copy message to a new folder"
     pixtype="pixbuf"/>
 
-    <toolitem type="separator"/>
+    <separator/>
 
     <toolitem name="Print" verb="MessagePrint"
     _label="Print" _tip="Print the selected message"
diff --git a/ui/evolution-subscribe.xml b/ui/evolution-subscribe.xml
index 1ee9d8ceb5..76cb99f38c 100644
--- a/ui/evolution-subscribe.xml
+++ b/ui/evolution-subscribe.xml
@@ -41,13 +41,13 @@
     _label="Unsubscribe" _tip="Remove folder from your list of subscribed folders"
     pixtype="pixbuf"/>
 
-    <toolitem type="separator"/>
+    <separator/>
 
     <toolitem name="RefreshList" verb=""
     _label="Refresh List" _tip="Refresh List of Folders"
     pixtype="pixbuf"/>
 
-    <toolitem type="separator"/>
+    <separator/>
 
     <control name="FolderSearch"/>