2008-04-02 Matthew Barnes <mbarnes@redhat.com> ** Merge the mbarnes-composer branch * configure.in: Bump libgtkhtml requirement to 3.19.1. Add gtkhtml-editor dependency for addressbook, calendar and mail. Remove print-message plugin; new composer implements this natively. * tools/Makefile.am: Remove CORBA rules for the old composer. * addressbook/gui/widgets/Makefile.am: Remove CORBA rules for the old composer. * addressbook/gui/widgets/eab-gui-util.c (eab_send_to_contact_and_email_num_list), (eab_send_contact_list_as_attachment): Adapt to new Bonobo-less composer widget. * calendar/gui/Makefile.am: Remove CORBA rules for the old composer. * calendar/gui/itip-utils.c (comp_from), (comp_to_list), (comp_subject), (comp_content_type), (comp_filename), (comp_description), (append_cal_attachments), (itip_send_comp), (reply_to_calendar_comp): Adapt to new Bonobo-less composer widget. * composer/Makefile.am: Remove CORBA rules for the old composer. * composer/e-msg-composer.c: * composer/e-msg-composer.h: EMsgComposer is now a subclass of GtkhtmlEditor. Extensive refactoring and cleanup, too much to list in detail. * composer/e-composer-header.c: * composer/e-composer-header.h: Add "sensitive" property along with get/set functions. * composer/e-composer-from-header.c: * composer/e-composer-from-header.h: Propagate "refreshed" signal from EAccountComboBox. Add function e_composer_from_header_get_account_list(). * composer/e-composer-private.c: * composer/e-composer-private.h: New files manage composer's private data. Allows other composer files to manipulate private data. * composer/e-msg-composer-hdrs.c: * composer/e-msg-composer-hdrs.h: Remove these files; replaced by EComposerHeaderTable widget. * composer/evolution-composer.c: * composer/evolution-composer.h: Remove these files; composer is now a subclass of GtkhtmlEditor. * composer/e-msg-composer-select-file.c: * composer/e-msg-composer-select-file.h: Remove these files; logic moved to e-msg-composer.c. * composer/listener.c: * composer/listener.h: Remove these files; event handlers moved to e-msg-composer.c. * composer/Composer.idl: * composer/Evolution-Composer.idl: Remove these files; composer is no longer a Bonobo object. * mail/em-composer-prefs (sig_edit_cb), (em_composer_prefs_new_signature): Adapt to new Bonobo-less signature editor. * mail/mail-signature-editor.c: * mail/mail-signature-editor.h: Rewrite the signature editor as a subclass of GtkhtmlEditor. Eliminates Bonobo from the equation. * mail/em-composer-utils.c (composer_get_message), (em_utils_composer_send_cb), (save_draft_done), (em_utils_composer_save_draft_cb), (create_new_composer), (em_utils_compose_new_message), (em_utils_compose_new_message_with_mailto), (em_utils_post_to_folder), (em_utils_post_to_url), (edit_message), (forward_attached), (forward_non_attached), (reply_get_composer), (composer_set_body), (em_utils_reply_to_message), (post_reply_to_message): Adapt to new Bonobo-less composer. * mail/mail-component-factory.c: Composer is no longer needs a Bonobo factory. * mail/mail-config.c: Fix style pattern for EMsgComposer widgets. * plugins/groupwise/mail-send-options.c (org_gnome_composer_send_options): Adapt to streamlined EMsgComposer API. * plugins/exchange-operations/Makefile.am: Add EVOLUTION_MAIL_CFLAGS and EVOLUTION_MAIL_LIBS. * plugins/exchange-operations/exchange-mail-send-options.c (append_to_header), (org_gnome_exchange_send_options): Adapt to streamlined EMsgComposer API. * plugins/mailing-list-actions/mailing-list-actions.c (emla_list_action_do): Adapt to streamlined EMsgComposer API. * po/POTFILES.in: Update file list for new composer. * ui/evolution-composer-entries.xml: Remove this file; obsoleted by new composer. * widgets/misc/Makefile.am: Add EVOLUTION_MAIL_LIBS. * widgets/misc/e-account-combo-box.c: * widgets/misc/e-account-combo-box.h: New function e_account_combo_box_get_account_list(). Emit a "refreshed" signal when the EAccountList changes. Add an internal reverse-lookup index. * widgets/misc/e-charset-picker.c (e_charser_add_radio_actions): New function adds radio actions to an action group. Will eventually replace e_charset_picker_bonobo_ui_populate(). * widgets/misc/e-signature-combo-box.c: * widgets/misc/e-signature-combo-box.h: New function e_signature_combo_box_get_signature_list(). ... separate issue ... * configure.in: Bump eds_minimum_version to 2.23.1 for CAMEL_FOLDER_JUNKED_NOT_DELETED symbol. svn path=/trunk/; revision=35313
174 lines
4.8 KiB
C
174 lines
4.8 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
|
|
*
|
|
* Authors: Parthasarathi Susarla <sparthasarathi@novell.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.
|
|
*
|
|
*/
|
|
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
|
|
#include <glib.h>
|
|
#include <glib/gi18n.h>
|
|
|
|
#include "mail-send-options.h"
|
|
|
|
#include "mail/em-menu.h"
|
|
#include "mail/em-utils.h"
|
|
#include "mail/em-event.h"
|
|
|
|
#include "composer/e-msg-composer.h"
|
|
#include "libedataserver/e-account.h"
|
|
|
|
#include "misc/e-send-options.h"
|
|
|
|
static ESendOptionsDialog * dialog = NULL ;
|
|
|
|
void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t);
|
|
|
|
static time_t
|
|
add_day_to_time (time_t time, int days)
|
|
{
|
|
struct tm *tm;
|
|
|
|
tm = localtime (&time);
|
|
tm->tm_mday += days;
|
|
tm->tm_isdst = -1;
|
|
|
|
return mktime (tm);
|
|
}
|
|
|
|
static void
|
|
feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
|
|
{
|
|
EMsgComposer *comp;
|
|
char value [100];
|
|
char *temp = NULL;
|
|
|
|
comp = (EMsgComposer *) data;
|
|
/* we are bothered only for ok response: other cases are handled generally*/
|
|
if (state == GTK_RESPONSE_OK) {
|
|
if (dialog->data->gopts->reply_enabled) {
|
|
if (dialog->data->gopts->reply_convenient)
|
|
e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" ) ;
|
|
else if (dialog->data->gopts->reply_within) {
|
|
time_t t;
|
|
t = add_day_to_time (time (NULL), dialog->data->gopts->reply_within);
|
|
strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t));
|
|
e_msg_composer_add_header (comp, X_REPLY_WITHIN , value) ;
|
|
}
|
|
}
|
|
|
|
if (dialog->data->gopts->expiration_enabled) {
|
|
if (dialog->data->gopts->expire_after != 0) {
|
|
time_t t;
|
|
t = add_day_to_time (time (NULL), dialog->data->gopts->expire_after);
|
|
strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t));
|
|
e_msg_composer_add_header (comp, X_EXPIRE_AFTER, value) ;
|
|
}
|
|
}
|
|
if (dialog->data->gopts->delay_enabled) {
|
|
strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&dialog->data->gopts->delay_until));
|
|
e_msg_composer_add_header (comp, X_DELAY_UNTIL, value) ;
|
|
}
|
|
|
|
/*Status Tracking Options*/
|
|
if (dialog->data->sopts->tracking_enabled) {
|
|
temp = g_strdup_printf ("%d",dialog->data->sopts->track_when) ;
|
|
e_msg_composer_add_header (comp, X_TRACK_WHEN, temp) ;
|
|
g_free (temp) ;
|
|
}
|
|
|
|
if (dialog->data->sopts->autodelete) {
|
|
e_msg_composer_add_header (comp, X_AUTODELETE, "1") ;
|
|
}
|
|
if (dialog->data->sopts->opened) {
|
|
temp = g_strdup_printf ("%d",dialog->data->sopts->opened) ;
|
|
e_msg_composer_add_header (comp, X_RETURN_NOTIFY_OPEN, temp) ;
|
|
g_free (temp) ;
|
|
}
|
|
if (dialog->data->sopts->declined) {
|
|
temp = g_strdup_printf ("%d",dialog->data->sopts->declined) ;
|
|
e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp) ;
|
|
g_free (temp) ;
|
|
}
|
|
|
|
if (dialog->data->gopts->priority) {
|
|
temp = g_strdup_printf ("%d",dialog->data->gopts->priority);
|
|
e_msg_composer_add_header (comp, X_SEND_OPT_PRIORITY, temp);
|
|
g_free (temp);
|
|
}
|
|
|
|
if (dialog->data->gopts->security) {
|
|
temp = g_strdup_printf ("%d",dialog->data->gopts->security);
|
|
e_msg_composer_add_header (comp, X_SEND_OPT_SECURITY, temp);
|
|
g_free (temp);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
send_options_commit (EMsgComposer *comp, gpointer user_data)
|
|
{
|
|
if (!user_data && !E_IS_SENDOPTIONS_DIALOG (user_data))
|
|
return;
|
|
|
|
if (dialog) {
|
|
g_object_unref (dialog);
|
|
dialog = NULL;
|
|
}
|
|
}
|
|
|
|
void
|
|
org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
|
|
{
|
|
|
|
EMsgComposer *comp = (struct _EMsgComposer *)t->composer ;
|
|
EComposerHeaderTable *table;
|
|
EAccount *account = NULL;
|
|
char *temp = NULL;
|
|
|
|
table = e_msg_composer_get_header_table (comp);
|
|
account = e_composer_header_table_get_account (table);
|
|
if (!account)
|
|
return;
|
|
|
|
temp = strstr (account->transport->url, "groupwise") ;
|
|
if (!temp) {
|
|
return;
|
|
}
|
|
e_msg_composer_set_send_options (comp, TRUE);
|
|
/* display the send options dialog */
|
|
if (!dialog) {
|
|
g_print ("New dialog\n\n") ;
|
|
dialog = e_sendoptions_dialog_new () ;
|
|
}
|
|
e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL) ;
|
|
|
|
g_signal_connect (dialog, "sod_response",
|
|
G_CALLBACK (feed_input_data), comp);
|
|
|
|
g_signal_connect (GTK_WIDGET (comp), "destroy",
|
|
G_CALLBACK (send_options_commit), dialog);
|
|
}
|
|
|
|
|