diff options
Diffstat (limited to 'plugins/exchange-operations')
| -rw-r--r-- | plugins/exchange-operations/ChangeLog | 9 | ||||
| -rw-r--r-- | plugins/exchange-operations/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/exchange-operations/exchange-mail-send-options.c | 19 |
3 files changed, 22 insertions, 10 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 67d80aef80..cc2504171d 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,12 @@ +2008-04-02 Matthew Barnes <mbarnes@redhat.com> + + * Makefile.am: + Add EVOLUTION_MAIL_CFLAGS and EVOLUTION_MAIL_LIBS. + + * exchange-mail-send-options.c (append_to_header), + (org_gnome_exchange_send_options): + Adapt to streamlined EMsgComposer API. + 2008-04-02 Ross Burton <ross@openedhand.com> ** Fix for bug #522764 diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am index b0fb377363..38d342452b 100644 --- a/plugins/exchange-operations/Makefile.am +++ b/plugins/exchange-operations/Makefile.am @@ -5,6 +5,7 @@ INCLUDES = -I . \ -I$(top_builddir)/composer \ -I$(top_builddir)/mail \ $(CAMEL_EXCHANGE_CFLAGS) \ + $(EVOLUTION_MAIL_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" @@ -54,7 +55,8 @@ liborg_gnome_exchange_operations_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ - $(CAMEL_EXCHANGE_LIBS) + $(CAMEL_EXCHANGE_LIBS) \ + $(EVOLUTION_MAIL_LIBS) liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 716ea7a01d..dd9c6f7f4f 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -30,7 +30,6 @@ #include "mail/em-event.h" #include "composer/e-msg-composer.h" -#include "composer/e-msg-composer-hdrs.h" #include "libedataserver/e-account.h" #include "exchange-send-options.h" @@ -43,7 +42,6 @@ static void append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) { EMsgComposer *composer; - EMsgComposerHdrs *hdrs; CamelAddress *sender_address; const char *sender_id, *recipient_id; struct _camel_header_address *addr; @@ -86,8 +84,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) else e_msg_composer_remove_header (composer, "Sensitivity"); - hdrs = e_msg_composer_get_hdrs (composer); - sender_address = (CamelAddress *) e_msg_composer_hdrs_get_from (hdrs); + sender_address = (CamelAddress *) e_msg_composer_get_from (composer); sender_id = (const char*) camel_address_encode (sender_address); addr = camel_header_address_decode (dialog->options->delegate_address, NULL); @@ -122,11 +119,12 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) } if (dialog->options->delivery_enabled) { - EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer); + EComposerHeaderTable *table; EAccount *account; char *mdn_address; - account = e_msg_composer_hdrs_get_from_account (hdrs); + table = e_msg_composer_get_header_table (composer); + account = e_composer_header_table_get_account (table); mdn_address = account->id->reply_to; if (!mdn_address || !*mdn_address) mdn_address = account->id->address; @@ -136,11 +134,12 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) e_msg_composer_remove_header (composer, "Return-Receipt-To"); if (dialog->options->read_enabled) { - EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer); + EComposerHeaderTable *table; EAccount *account; char *mdn_address; - account = e_msg_composer_hdrs_get_from_account (hdrs); + table = e_msg_composer_get_header_table (composer); + account = e_composer_header_table_get_account (table); mdn_address = account->id->reply_to; if (!mdn_address || !*mdn_address) mdn_address = account->id->address; @@ -169,10 +168,12 @@ void org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target) { EMsgComposer *composer = target->composer; + EComposerHeaderTable *table; EAccount *account = NULL; char *temp = NULL; - account = e_msg_composer_get_preferred_account (composer); + table = e_msg_composer_get_header_table (composer); + account = e_composer_header_table_get_account (table); if (!account) return; |