aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/exchange-operations
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-11-28 04:24:44 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-11-28 04:24:44 +0800
commitf5bed9bf7b143fff9bd258ea31fdac192e00a0d9 (patch)
tree46dca324c927780390cfbc8f4ddf200184462926 /plugins/exchange-operations
parent8aa60af54eee1092e8963c0927c53e8f738eb4cd (diff)
downloadgsoc2013-evolution-f5bed9bf7b143fff9bd258ea31fdac192e00a0d9.tar.gz
gsoc2013-evolution-f5bed9bf7b143fff9bd258ea31fdac192e00a0d9.tar.zst
gsoc2013-evolution-f5bed9bf7b143fff9bd258ea31fdac192e00a0d9.zip
** Fixes bug #495123
2007-11-27 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #495123 * composer/Makefile.am: Add a bunch of files for managing composer headers. * composer/e-msg-composer.c (build_message), (from_changed_cb), (set_editor_signature), (e_msg_composer_set_body), (e_msg_composer_get_preferred_account): * plugins/exchange-operations/exchange-mail-send-options.c (append_to_header): Use e_msg_composer_hdrs_get_from_account() to obtain the EAccount. * composer/e-msg-composer-hdrs.c: * composer/e-msg-composer-hdrs.h: Massive refactoring to use new EComposerHeader classes. * composer/e-composer-header.c: * composer/e-composer-header.h: * composer/e-composer-from-header.c: * composer/e-composer-from-header.h: * composer/e-composer-name-header.c: * composer/e-composer-name-header.h: * composer/e-composer-post-header.c: * composer/e-composer-post-header.h: * composer/e-composer-text-header.c: * composer/e-composer-text-header.h: New GObject classes manage different types of composer headers. See bug #495123 for a more detailed description of each class. * mail/mail-session.c (mail_session_init): Pass the CamelSession to the EAccountComboBox class (ugly hack). * widgets/misc/Makefile.am: Add e-account-combo-box.[ch]. * widgets/misc/e-account-combo-box.c: * widgets/misc/e-account-combo-box.h: New widget renders an EAccountList as a combo box. Also listens for changes to the EAccountList and updates itself accordingly. svn path=/trunk/; revision=34600
Diffstat (limited to 'plugins/exchange-operations')
-rw-r--r--plugins/exchange-operations/ChangeLog7
-rw-r--r--plugins/exchange-operations/exchange-mail-send-options.c14
2 files changed, 17 insertions, 4 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index e69873d123..9c7cec7959 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-27 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #495123
+
+ * exchange-mail-send-options.c (append_to_header):
+ Use e_msg_composer_hdrs_get_from_account() to obtain the EAccount.
+
2007-11-23 Milan Crha <mcrha@redhat.com>
** Fix for bug #479081
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 8852e993a0..716ea7a01d 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -123,10 +123,13 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
if (dialog->options->delivery_enabled) {
EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer);
+ EAccount *account;
+ char *mdn_address;
- char *mdn_address = hdrs->account->id->reply_to;
+ account = e_msg_composer_hdrs_get_from_account (hdrs);
+ mdn_address = account->id->reply_to;
if (!mdn_address || !*mdn_address)
- mdn_address = hdrs->account->id->address;
+ mdn_address = account->id->address;
e_msg_composer_modify_header (composer, "Return-Receipt-To", mdn_address);
}
else
@@ -134,10 +137,13 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
if (dialog->options->read_enabled) {
EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer);
+ EAccount *account;
+ char *mdn_address;
- char *mdn_address = hdrs->account->id->reply_to;
+ account = e_msg_composer_hdrs_get_from_account (hdrs);
+ mdn_address = account->id->reply_to;
if (!mdn_address || !*mdn_address)
- mdn_address = hdrs->account->id->address;
+ mdn_address = account->id->address;
e_msg_composer_modify_header (composer, "Disposition-Notification-To", mdn_address);
}