[geary/wip/save-sent-713263] Make e/mail consistent
- From: Charles Lindsay <clindsay src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/save-sent-713263] Make e/mail consistent
- Date: Tue, 28 Jan 2014 02:30:50 +0000 (UTC)
commit 34c67f28d3e19dc899876bbba8cb35b4853a8325
Author: Charles Lindsay <chaz yorba org>
Date: Mon Jan 27 17:18:46 2014 -0800
Make e/mail consistent
src/client/application/geary-controller.vala | 8 ++++----
src/client/components/status-bar.vala | 6 +++---
src/engine/api/geary-account.vala | 2 +-
src/engine/imap-db/outbox/smtp-outbox-folder.vala | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index e00d54a..7ded3d2 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -655,8 +655,8 @@ public class GearyController : Geary.BaseObject {
handle_outbox_failure(StatusBar.Message.OUTBOX_SEND_FAILURE);
break;
- case Geary.Account.Problem.SAVE_SENT_EMAIL_FAILED:
- handle_outbox_failure(StatusBar.Message.OUTBOX_SAVE_SENT_EMAIL_FAILED);
+ case Geary.Account.Problem.SAVE_SENT_MAIL_FAILED:
+ handle_outbox_failure(StatusBar.Message.OUTBOX_SAVE_SENT_MAIL_FAILED);
break;
default:
@@ -696,7 +696,7 @@ public class GearyController : Geary.BaseObject {
_("Geary encountered an error sending an email. If the problem persists, please
manually delete the email from your Outbox folder."));
break;
- case StatusBar.Message.OUTBOX_SAVE_SENT_EMAIL_FAILED:
+ case StatusBar.Message.OUTBOX_SAVE_SENT_MAIL_FAILED:
libnotify.set_error_notification(_("Error saving sent email"),
_("Geary encountered an error saving a sent message to Sent Mail. The message will
stay in your Outbox folder until you delete it."));
break;
@@ -710,7 +710,7 @@ public class GearyController : Geary.BaseObject {
private void on_account_email_removed(Geary.Folder folder, Gee.Collection<Geary.EmailIdentifier> ids) {
if (folder.special_folder_type == Geary.SpecialFolderType.OUTBOX) {
main_window.status_bar.deactivate_message(StatusBar.Message.OUTBOX_SEND_FAILURE);
- main_window.status_bar.deactivate_message(StatusBar.Message.OUTBOX_SAVE_SENT_EMAIL_FAILED);
+ main_window.status_bar.deactivate_message(StatusBar.Message.OUTBOX_SAVE_SENT_MAIL_FAILED);
libnotify.clear_error_notification();
}
}
diff --git a/src/client/components/status-bar.vala b/src/client/components/status-bar.vala
index adae15d..26058a9 100644
--- a/src/client/components/status-bar.vala
+++ b/src/client/components/status-bar.vala
@@ -17,7 +17,7 @@ public class StatusBar : Gtk.Statusbar {
public enum Message {
OUTBOX_SENDING,
OUTBOX_SEND_FAILURE,
- OUTBOX_SAVE_SENT_EMAIL_FAILED;
+ OUTBOX_SAVE_SENT_MAIL_FAILED;
internal string get_text() {
switch (this) {
@@ -27,7 +27,7 @@ public class StatusBar : Gtk.Statusbar {
case Message.OUTBOX_SEND_FAILURE:
/// Displayed in the space-limited status bar when a message fails to be sent due to
error.
return _("Error sending email");
- case Message.OUTBOX_SAVE_SENT_EMAIL_FAILED:
+ case Message.OUTBOX_SAVE_SENT_MAIL_FAILED:
// Displayed in the space-limited status bar when a message fails to be uploaded
// to Sent Mail after being sent.
return _("Error saving sent email");
@@ -42,7 +42,7 @@ public class StatusBar : Gtk.Statusbar {
return Context.OUTBOX;
case Message.OUTBOX_SEND_FAILURE:
return Context.OUTBOX;
- case Message.OUTBOX_SAVE_SENT_EMAIL_FAILED:
+ case Message.OUTBOX_SAVE_SENT_MAIL_FAILED:
return Context.OUTBOX;
default:
assert_not_reached();
diff --git a/src/engine/api/geary-account.vala b/src/engine/api/geary-account.vala
index db2769a..89902c0 100644
--- a/src/engine/api/geary-account.vala
+++ b/src/engine/api/geary-account.vala
@@ -12,7 +12,7 @@ public interface Geary.Account : BaseObject {
NETWORK_UNAVAILABLE,
DATABASE_FAILURE,
EMAIL_DELIVERY_FAILURE,
- SAVE_SENT_EMAIL_FAILED,
+ SAVE_SENT_MAIL_FAILED,
}
public abstract Geary.AccountInformation information { get; protected set; }
diff --git a/src/engine/imap-db/outbox/smtp-outbox-folder.vala
b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
index 8fa3e2e..6146682 100644
--- a/src/engine/imap-db/outbox/smtp-outbox-folder.vala
+++ b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
@@ -272,10 +272,10 @@ private class Geary.SmtpOutboxFolder : Geary.AbstractLocalFolder, Geary.FolderSu
try {
debug("Outbox postman: Saving %s to sent mail", row.outbox_id.to_string());
- yield save_sent_email_async(message, null);
+ yield save_sent_mail_async(message, null);
} catch (Error e) {
debug("Outbox postman: Error saving sent email: %s", e.message);
- report_problem(Geary.Account.Problem.SAVE_SENT_EMAIL_FAILED, e);
+ report_problem(Geary.Account.Problem.SAVE_SENT_MAIL_FAILED, e);
continue;
}
@@ -628,7 +628,7 @@ private class Geary.SmtpOutboxFolder : Geary.AbstractLocalFolder, Geary.FolderSu
email_sent(rfc822);
}
- private async void save_sent_email_async(Geary.RFC822.Message rfc822, Cancellable? cancellable)
+ private async void save_sent_mail_async(Geary.RFC822.Message rfc822, Cancellable? cancellable)
throws Error {
Geary.Folder? sent_mail = _account.get_special_folder(Geary.SpecialFolderType.SENT);
Geary.FolderSupport.Create? create = sent_mail as Geary.FolderSupport.Create;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]