aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ChangeLog11
-rw-r--r--ui/evolution-comp-editor.xml2
-rw-r--r--ui/evolution-contact-editor.xml2
-rw-r--r--ui/evolution-contact-list-editor.xml2
-rw-r--r--ui/evolution-event-editor.xml2
-rw-r--r--ui/evolution-mail-messagedisplay.xml2
-rw-r--r--ui/evolution-message-composer.xml2
-rw-r--r--ui/evolution-signature-editor.xml2
-rw-r--r--ui/evolution.xml2
9 files changed, 18 insertions, 9 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 1318a1dad3..baa6f90d03 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-06 Rodney Dawes <dobey@ximian.com>
+
+ * evolution-comp-editor.xml:
+ * evolution-contact-editor.xml:
+ * evolution-contact-list-editor.xml:
+ * evolution-event-editor.xml:
+ * evolution-mail-messagedisplay.xml:
+ * evolution-message-composer.xml:
+ * evolution-signature-editor.xml:
+ * evolution.xml: Fixes bug #39488, use hlook="system" for toolbars
+
2003-12-31 Kidd Wang <kidd.wang@sun.com>
* evolution-tasks.xml: Add a menu item [Open Task] to [File] for
diff --git a/ui/evolution-comp-editor.xml b/ui/evolution-comp-editor.xml
index 2fbc5f26cd..db056b19c5 100644
--- a/ui/evolution-comp-editor.xml
+++ b/ui/evolution-comp-editor.xml
@@ -70,7 +70,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive"
- _tip="Main toolbar" hlook="both_horiz" vlook="icon">
+ _tip="Main toolbar" hlook="system" vlook="icon">
<toolitem name="FileSaveAndClose" verb="" _label="Save and Close" priority="1"/>
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index c7c037811b..8511080764 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -73,7 +73,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive"
- hlook="both_horiz" vlook="icon">
+ hlook="system" vlook="icon">
<toolitem name="ContactEditorSaveClose" verb=""
_label="Save and Close" priority="1" pixtype="pixbuf"/>
diff --git a/ui/evolution-contact-list-editor.xml b/ui/evolution-contact-list-editor.xml
index fa14c4b835..5ce79661a3 100644
--- a/ui/evolution-contact-list-editor.xml
+++ b/ui/evolution-contact-list-editor.xml
@@ -49,7 +49,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive"
- hlook="both_horiz" vlook="icon">
+ hlook="system" vlook="icon">
<toolitem name="ContactListEditorSaveClose" verb="" _label="Save and Close" priority="1" pixtype="pixbuf"/>
<separator/>
diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml
index 67f825ccb2..cb360bbb6c 100644
--- a/ui/evolution-event-editor.xml
+++ b/ui/evolution-event-editor.xml
@@ -39,7 +39,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive"
- _tip="Main toolbar" hlook="both_horiz" vlook="icon">
+ _tip="Main toolbar" hlook="system" vlook="icon">
<placeholder name="Actions">
<separator f="" name="eventeditor2"/>
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
index 1f74ae4df2..fb0a8a9035 100644
--- a/ui/evolution-mail-messagedisplay.xml
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -47,8 +47,6 @@
relief="none"
behavior="exclusive"
_tip="Main toolbar"
- hlook="both_horiz"
- vlook="icon">
<placeholder name="MailMessageToolbar"/>
<separator f="" name="emailmessage"/>
<placeholder name="MailNextButtons"/>
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index 136aca413c..541d4fad99 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -132,7 +132,7 @@
</menu>
- <dockitem name="Toolbar" behavior="exclusive" hlook="both_horiz" vlook="icon">
+ <dockitem name="Toolbar" behavior="exclusive" hlook="system" vlook="icon">
<toolitem name="FileSend" verb="" pixtype="pixbuf" priority="1"/>
<toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/>
diff --git a/ui/evolution-signature-editor.xml b/ui/evolution-signature-editor.xml
index 0e25735b46..2b7ae371b6 100644
--- a/ui/evolution-signature-editor.xml
+++ b/ui/evolution-signature-editor.xml
@@ -66,7 +66,7 @@
<placeholder name="Component"/>
</menu>
- <dockitem name="Toolbar" behavior="exclusive" hlook="both_horiz" vlook="icon">
+ <dockitem name="Toolbar" behavior="exclusive" hlook="system" vlook="icon">
<toolitem name="FileSaveClose" verb=""/>
</dockitem>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 1011289a10..d78ac04df3 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -108,7 +108,7 @@
</menu>
<dockitem name="Toolbar" relief="none" behavior="exclusive" config="0" _tip="Main toolbar"
- hlook="both_horiz" vlook="icon">
+ hlook="system" vlook="icon">
<control name="NewComboButton"/>
<separator f="" name="eshell4"/>