diff options
Diffstat (limited to 'plugins/exchange-operations/exchange-mail-send-options.c')
| -rw-r--r-- | plugins/exchange-operations/exchange-mail-send-options.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index df23f7f6a2..8852e993a0 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -3,16 +3,16 @@ * Authors: R.Raghavendran <raghavguru7@gmail.com> * * Copyright 2004 Novell, Inc. (www.novell.com) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -39,7 +39,7 @@ void org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *t); static ExchangeSendOptionsDialog *dialog=NULL; -static void +static void append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) { EMsgComposer *composer; @@ -54,8 +54,8 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) if (dialog->options->importance) { switch (dialog->options->importance) { case E_IMP_HIGH : - e_msg_composer_modify_header (composer, "Importance", "high"); - break; + e_msg_composer_modify_header (composer, "Importance", "high"); + break; case E_IMP_LOW : e_msg_composer_modify_header (composer, "Importance", "low"); break; @@ -66,7 +66,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) } else e_msg_composer_remove_header (composer, "Importance"); - + if (dialog->options->sensitivity) { switch (dialog->options->sensitivity) { case E_SENSITIVITY_CONFIDENTIAL : @@ -85,37 +85,37 @@ 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_id = (const char*) camel_address_encode (sender_address); - + addr = camel_header_address_decode (dialog->options->delegate_address, NULL); sender_addr = camel_header_address_decode (sender_id, NULL); - - if(dialog->options->send_as_del_enabled && - dialog->options->delegate_address && + + if(dialog->options->send_as_del_enabled && + dialog->options->delegate_address && g_ascii_strcasecmp(addr->v.addr, sender_addr->v.addr)) { e_msg_composer_modify_header (composer, "Sender" , sender_id); - /* This block handles the case wherein the address to be added - * in the "From" field has no name associated with it. - * So for cases where there is no name we append the address + /* This block handles the case wherein the address to be added + * in the "From" field has no name associated with it. + * So for cases where there is no name we append the address * (only email) within angular braces. */ if(!g_ascii_strcasecmp (addr->name, "")) { - recipient_id = g_strdup_printf ("<%s>", + recipient_id = g_strdup_printf ("<%s>", dialog->options->delegate_address); e_msg_composer_add_header (composer, "From", recipient_id); - } - + } + else - e_msg_composer_add_header (composer, "From", - dialog->options->delegate_address); + e_msg_composer_add_header (composer, "From", + dialog->options->delegate_address); } - - + + else { e_msg_composer_remove_header (composer, "Sender"); e_msg_composer_add_header (composer, "From", sender_id); @@ -123,7 +123,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) if (dialog->options->delivery_enabled) { EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer); - + char *mdn_address = hdrs->account->id->reply_to; if (!mdn_address || !*mdn_address) mdn_address = hdrs->account->id->address; @@ -134,7 +134,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) if (dialog->options->read_enabled) { EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer); - + char *mdn_address = hdrs->account->id->reply_to; if (!mdn_address || !*mdn_address) mdn_address = hdrs->account->id->address; @@ -145,27 +145,27 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) e_msg_composer_remove_header (composer, "Disposition-Notification-To"); } } - + static void send_options_commit (EMsgComposer *comp, gpointer user_data) { if (!user_data && !EXCHANGE_IS_SENDOPTIONS_DIALOG (user_data)) return; - + if (dialog) { g_print ("\nDialog getting unreferenced "); g_object_unref (dialog); - dialog = NULL; + dialog = NULL; } } -void +void org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target) { EMsgComposer *composer = target->composer; - EAccount *account = NULL; + EAccount *account = NULL; char *temp = NULL; - + account = e_msg_composer_get_preferred_account (composer); if (!account) return; @@ -185,5 +185,5 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target) g_signal_connect (GTK_WIDGET (composer), "destroy", G_CALLBACK (send_options_commit), dialog); - + } |