aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/e-composer-actions.c18
-rw-r--r--composer/mail-composer.error.xml2
2 files changed, 2 insertions, 18 deletions
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 8388888234..f16fbdf2f1 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -239,23 +239,7 @@ static void
action_send_cb (GtkAction *action,
EMsgComposer *composer)
{
- CamelSession *session;
-
- session = e_msg_composer_ref_session (composer);
-
- /* If we're online, send the message now.
- * Otherwise write the message to Outbox. */
- if (camel_session_get_online (session))
- e_msg_composer_send (composer);
- else {
- /* Inform the user. */
- e_alert_run_dialog_for_args (
- GTK_WINDOW (composer),
- "mail-composer:saving-to-outbox", NULL);
- e_msg_composer_save_to_outbox (composer);
- }
-
- g_object_unref (session);
+ e_msg_composer_send (composer);
}
static void
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index 0f6f11d429..65379e1284 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -84,7 +84,7 @@
<error id="saving-to-outbox" type="info">
<_primary>Saving message to Outbox.</_primary>
- <_secondary>Because you are working offline, the message will be saved to your local Outbox folder. When you are back online you can send the message by clicking the Send/Receive button in Evolution's toolbar.</_secondary>
+ <_secondary>The message will be saved to your local Outbox folder, because the destination service is currently unavailable. You can send the message by clicking the Send/Receive button in Evolution's toolbar.</_secondary>
</error>
</error-list>