From 919563751e1cce6a0aa42f6ec8bd02f84ec7d67c Mon Sep 17 00:00:00 2001
From: Rodney Dawes <dobey@ximian.com>
Date: Wed, 17 Dec 2003 22:57:48 +0000
Subject: Fix bug #49949

2003-12-17  Rodney Dawes  <dobey@ximian.com>

	* evolution-mail-message.xml:
	* evolution-mail-messagedisplay.xml: Fix bug #49949

svn path=/trunk/; revision=23973
---
 ui/ChangeLog                         |  5 +++++
 ui/evolution-mail-message.xml        |  4 +++-
 ui/evolution-mail-messagedisplay.xml | 10 ----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ui/ChangeLog b/ui/ChangeLog
index a89e23d453..a13d0799d5 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-17  Rodney Dawes  <dobey@ximian.com>
+
+	* evolution-mail-message.xml:
+	* evolution-mail-messagedisplay.xml: Fix bug #49949
+
 2003-12-17  Chris Toshok  <toshok@ximian.com>
 
 	* evolution-addressbook.xml: add ContactsViewPreview command, a
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 2e8bd8134d..1d0a7557c7 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -380,7 +380,7 @@
     </submenu>
   </menu>
 
-  <dockitem name="Toolbar">
+  <dockitem name="Toolbar" behavior="exclusive">
 
     <placeholder name="MailMessageToolbar">
       <toolitem name="MessageReplySender" verb=""
@@ -423,6 +423,8 @@
        pixtype="pixbuf"/>
     </placeholder>
 
+    <separator f="" name="emailmessage"/>
+
     <placeholder name="MailNextButtons">
       <toolitem name="MailPrevious" verb=""
        _label="Previous"
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
index 1f74ae4df2..16cad82e04 100644
--- a/ui/evolution-mail-messagedisplay.xml
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -43,14 +43,4 @@
 
   </menu>
 
-  <dockitem name="Toolbar" 
-            relief="none" 
-            behavior="exclusive"
-	    _tip="Main toolbar" 
-            hlook="both_horiz" 
-            vlook="icon">
-    <placeholder name="MailMessageToolbar"/>
-    <separator f="" name="emailmessage"/>
-    <placeholder name="MailNextButtons"/>
-  </dockitem>
 </Root>
-- 
cgit