diff options
| -rw-r--r-- | ui/ChangeLog | 7 | ||||
| -rw-r--r-- | ui/evolution-mail-message.xml | 2 | ||||
| -rw-r--r-- | ui/evolution-mail-messagedisplay.xml | 10 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog index 8de2e8a96a..34f24cb3f9 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,10 @@ +2003-12-18 Rodney Dawes <dobey@ximian.com> + + * evolution-mail-message.xml: + * evolution-mail-messagedisplay.xml: Revert previous patch to + fix bug #49949 - exposes crash in libbonoboui when switching + away from mail component + 2003-12-18 Calvin Liu <calvin.liu@sun.com> * evolution-mail-message.xml: On [Action] menu, change [Forward] diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml index 668cc7be11..c4ac654b8f 100644 --- a/ui/evolution-mail-message.xml +++ b/ui/evolution-mail-message.xml @@ -380,7 +380,7 @@ </submenu> </menu> - <dockitem name="Toolbar" behavior="exclusive"> + <dockitem name="Toolbar"> <placeholder name="MailMessageToolbar"> <toolitem name="MessageReplySender" verb="" diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml index 16cad82e04..1f74ae4df2 100644 --- a/ui/evolution-mail-messagedisplay.xml +++ b/ui/evolution-mail-messagedisplay.xml @@ -43,4 +43,14 @@ </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> |