diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-05-30 00:53:03 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-05-30 00:53:03 +0800 |
| commit | 103897ed64fa2567fa172a219eb116e6b9443809 (patch) | |
| tree | 906a5cfd2ee7f502dc880ce72b6a08aa6221ce6a | |
| parent | 3af14eff0c42933198e9428dff63ef381c8a8280 (diff) | |
| download | gsoc2013-evolution-103897ed64fa2567fa172a219eb116e6b9443809.tar gsoc2013-evolution-103897ed64fa2567fa172a219eb116e6b9443809.tar.gz gsoc2013-evolution-103897ed64fa2567fa172a219eb116e6b9443809.tar.bz2 gsoc2013-evolution-103897ed64fa2567fa172a219eb116e6b9443809.tar.lz gsoc2013-evolution-103897ed64fa2567fa172a219eb116e6b9443809.tar.xz gsoc2013-evolution-103897ed64fa2567fa172a219eb116e6b9443809.tar.zst gsoc2013-evolution-103897ed64fa2567fa172a219eb116e6b9443809.zip | |
Bug 729519 - [Composer] Do not show 'Untitled Message' in Discard question
| -rw-r--r-- | composer/e-msg-composer.c | 8 | ||||
| -rw-r--r-- | composer/mail-composer.error.xml | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 55e78814de..1f9f7e0f06 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -4919,7 +4919,7 @@ e_msg_composer_can_close (EMsgComposer *composer, EComposerHeaderTable *table; GdkWindow *window; GtkWidget *widget; - const gchar *subject; + const gchar *subject, *message_name; gint response; editor = GTKHTML_EDITOR (composer); @@ -4940,11 +4940,13 @@ e_msg_composer_can_close (EMsgComposer *composer, subject = e_composer_header_table_get_subject (table); if (subject == NULL || *subject == '\0') - subject = _("Untitled Message"); + message_name = "mail-composer:exit-unsaved-no-subject"; + else + message_name = "mail-composer:exit-unsaved"; response = e_alert_run_dialog_for_args ( GTK_WINDOW (composer), - "mail-composer:exit-unsaved", + message_name, subject, NULL); switch (response) { diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml index 65379e1284..0dcd8d9a07 100644 --- a/composer/mail-composer.error.xml +++ b/composer/mail-composer.error.xml @@ -43,6 +43,14 @@ <button _label="_Save Draft" response="GTK_RESPONSE_YES"/> </error> + <error id="exit-unsaved-no-subject" type="warning" default="GTK_RESPONSE_CANCEL"> + <_primary>Are you sure you want to discard the message you are composing?</_primary> + <_secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</_secondary> + <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/> + <button _label="_Continue Editing" response="GTK_RESPONSE_CANCEL"/> + <button _label="_Save Draft" response="GTK_RESPONSE_YES"/> + </error> + <error id="no-build-message" type="error"> <_primary>Could not create message.</_primary> <_secondary>Because "{0}", you may need to select different mail options.</_secondary> |