** Merge the mbarnes-composer branch

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

1 files changed, 145 insertions, 0 deletions

diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
new file mode 100644
index 0000000000..c0557a4a26
--- /dev/null
+++ b/composer/e-composer-private.h
@@ -0,0 +1,145 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2008 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser 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 Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef E_COMPOSER_PRIVATE_H
+#define E_COMPOSER_PRIVATE_H
+
+#include "e-msg-composer.h"
+
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include "gconf-bridge.h"
+
+#include <libedataserver/e-iconv.h>
+
+#include "e-attachment-bar.h"
+#include "e-composer-actions.h"
+#include "e-composer-autosave.h"
+#include "e-composer-header-table.h"
+
+#define E_MSG_COMPOSER_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_MSG_COMPOSER, EMsgComposerPrivate))
+
+/* Mail configuration keys */
+#define MAIL_GCONF_PREFIX \
+	"/apps/evolution/mail"
+#define MAIL_GCONF_CHARSET_KEY \
+	MAIL_GCONF_PREFIX "/format/charset"
+
+/* Composer configuration keys */
+#define COMPOSER_GCONF_PREFIX \
+	MAIL_GCONF_PREFIX "/composer"
+#define COMPOSER_GCONF_CHARSET_KEY \
+	COMPOSER_GCONF_PREFIX "/charset"
+#define COMPOSER_GCONF_CURRENT_FOLDER_KEY \
+	COMPOSER_GCONF_PREFIX "/current_folder"
+#define COMPOSER_GCONF_INLINE_SPELLING_KEY \
+	COMPOSER_GCONF_PREFIX "/inline_spelling"
+#define COMPOSER_GCONF_MAGIC_LINKS_KEY \
+	COMPOSER_GCONF_PREFIX "/magic_links"
+#define COMPOSER_GCONF_MAGIC_SMILEYS_KEY \
+	COMPOSER_GCONF_PREFIX "/magic_smileys"
+#define COMPOSER_GCONF_REQUEST_RECEIPT_KEY \
+	COMPOSER_GCONF_PREFIX "/request_receipt"
+#define COMPOSER_GCONF_TOP_SIGNATURE_KEY \
+	COMPOSER_GCONF_PREFIX "/top_signature"
+#define COMPOSER_GCONF_SEND_HTML_KEY \
+	COMPOSER_GCONF_PREFIX "/send_html"
+#define COMPOSER_GCONF_VIEW_BCC_KEY \
+	COMPOSER_GCONF_PREFIX "/view/Bcc"
+#define COMPOSER_GCONF_VIEW_CC_KEY \
+	COMPOSER_GCONF_PREFIX "/view/Cc"
+#define COMPOSER_GCONF_VIEW_FROM_KEY \
+	COMPOSER_GCONF_PREFIX "/view/From"
+#define COMPOSER_GCONF_VIEW_POST_TO_KEY \
+	COMPOSER_GCONF_PREFIX "/view/PostTo"
+#define COMPOSER_GCONF_VIEW_REPLY_TO_KEY \
+	COMPOSER_GCONF_PREFIX "/view/ReplyTo"
+#define COMPOSER_GCONF_WINDOW_PREFIX \
+	COMPOSER_GCONF_PREFIX "/window"
+
+/* Shorthand, requires a variable named "composer". */
+#define ACTION(name)	(E_COMPOSER_ACTION_##name (composer))
+
+/* For use in dispose() methods. */
+#define DISPOSE(obj) \
+	G_STMT_START { \
+	if ((obj) != NULL) { g_object_unref (obj); (obj) = NULL; } \
+	} G_STMT_END
+
+G_BEGIN_DECLS
+
+struct _EMsgComposerPrivate {
+
+	/*** UI Management ***/
+
+	GtkWidget *html_editor;
+	GtkWidget *header_table;
+	GtkActionGroup *charset_actions;
+	GtkActionGroup *composer_actions;
+
+	GPtrArray *extra_hdr_names, *extra_hdr_values;
+	GArray *gconf_bridge_binding_ids;
+
+	GtkWidget *focused_entry;
+
+	GtkWidget *attachment_bar;
+	GtkWidget *attachment_scrolled_window;
+	GtkWidget *attachment_expander;
+	GtkWidget *attachment_expander_label;
+	GtkWidget *attachment_expander_icon;
+	GtkWidget *attachment_expander_num;
+
+	GtkWidget *address_dialog;
+
+	GHashTable *inline_images;
+	GHashTable *inline_images_by_url;
+	GList *current_images;
+
+	gchar *mime_type, *mime_body, *charset;
+
+	guint32 attachment_bar_visible : 1;
+	guint32 is_alternative         : 1;
+	guint32 autosaved              : 1;
+
+	guint32 mode_post              : 1;
+
+	guint32 in_signature_insert    : 1;
+
+	CamelMimeMessage *redirect;
+
+	guint notify_id;
+
+	gboolean send_invoked;
+};
+
+void		e_composer_private_init		(EMsgComposer *composer);
+void		e_composer_private_dispose	(EMsgComposer *composer);
+void		e_composer_private_finalize	(EMsgComposer *composer);
+
+/* Private Utilities */
+
+void		e_composer_actions_init		(EMsgComposer *composer);
+gchar *		e_composer_find_data_file	(const gchar *basename);
+gchar *		e_composer_get_default_charset	(void);
+
+G_END_DECLS
+
+#endif /* E_COMPOSER_PRIVATE_H */