aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/mail-composer.error.xml4
-rw-r--r--ui/ChangeLog7
-rw-r--r--ui/evolution-message-composer.xml3
4 files changed, 19 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 2a4e16c6f0..11ece56b4d 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-26 Veerapuram Varadhan <vvaradhan@novell.com>
+
+ ** Fixes #401546
+
+ mail-composer.error.xml: Added a new error in case if send options
+ is not supported by a provider and user tries to use it.
+
2007-02-26 Sankar P <psankar@novell.com>
* e-msg-composer.c: (autosave_manager_query_load_orphans),
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index ed45bb292f..210756bb52 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -77,4 +77,8 @@
Please make sure that you have the correct version of gtkhtml and libgtkhtml installed.</_secondary>
</error>
+ <error id="send-options-support" type="error" modal="true">
+ <_primary>Send options not available.</_primary>
+ <_secondary>Send options available only for Novell Groupwise and Microsoft Exchange accounts.</_secondary>
+ </error>
</error-list>
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 75927e3f43..d17c065bbc 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-26 Veerapuram Varadhan <vvaradhan@novell.com>
+
+ ** Fixes #401546
+
+ evolution-message-composer.xml: Remove accelarator key for Send
+ Options menu item.
+
2007-01-18 Raghavendran R <raghavguru7@gmail.com>
* evolution-message-composer.xml: Added Send options button
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index aeb528eff5..cbe1b32973 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -85,7 +85,7 @@
type="toggle" state="0" hidden="1"/>
<cmd name="InsertXSendOptions" _tip="Insert Send options"
- accel="*Control*o" pixtype="pixbuf"/>
+ pixtype="pixbuf"/>
</commands>
@@ -167,7 +167,6 @@
<toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/>
<separator f="" name="emailcomposer"/>
- <toolitem name="InsertXSendOptions" verb="" _label="Send Options" _tip="Send Options"/>
</dockitem>
</Root>