** 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

12 files changed, 38 insertions, 217 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;
 
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index f10faa6efb..ad257042d5 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	* mail-send-options.c (org_gnome_composer_send_options):
+	Adapt to streamlined EMsgComposer API.
+
 2008-03-27  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #511957
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 6fefa06e4b..84ca2ef00e 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -142,10 +142,12 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 {
 
 	EMsgComposer *comp = (struct _EMsgComposer *)t->composer ;
+	EComposerHeaderTable *table;
 	EAccount *account = NULL;
 	char *temp = NULL;
 
-	account = e_msg_composer_get_preferred_account (comp) ;
+	table = e_msg_composer_get_header_table (comp);
+	account = e_composer_header_table_get_account (table);
 	if (!account)
 		return;
 
diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog
index acb68eba4c..4ee1500d4d 100644
--- a/plugins/mailing-list-actions/ChangeLog
+++ b/plugins/mailing-list-actions/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	* mailing-list-actions.c (emla_list_action_do):
+	Adapt to streamlined EMsgComposer API.
+
 2007-12-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	* mailing-list-actions.c:
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index 1ffea79954..fc98ee7bc7 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -150,7 +150,9 @@ void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage
 				/* directly send message */
 				composer = e_msg_composer_new_from_url (url);
 				if ((account = mail_config_get_account_by_source_url (action_data->uri)))
-					e_msg_composer_hdrs_set_from_account (e_msg_composer_get_hdrs(composer), account->name);
+					e_composer_header_table_set_account (
+						e_msg_composer_get_header_table (composer),
+						account);
 				em_utils_composer_send_cb (composer, NULL);
 			} else if (send_message_response == GTK_RESPONSE_NO) {
 				/* show composer */
diff --git a/plugins/print-message/ChangeLog b/plugins/print-message/ChangeLog
deleted file mode 100644
index 791ab42cbd..0000000000
--- a/plugins/print-message/ChangeLog
+++ /dev/null
@@ -1,61 +0,0 @@
-2007-08-27  Matthew Barnes  <mbarnes@redhat.com>
-
-	* org-gnome-print-message.eplug.xml:
-	Use consistent terminology for mail messages (#480621).
-
-2007-08-24  Matthew Barnes  <mbarnes@redhat.com>
-
-	** Fixes part of bug #355766
-
-	* print-message.c (org_gnome_print_preview):
-	Call e_msg_composer_get_message_print().
-
-2007-05-11  Gilles Dartiguelongue  <dartigug@esiee.fr>
-
-	* print-message.c: fix prototypes,
-	fixes part of bug #437584.
-
-2007-04-20  Matthew Barnes  <mbarnes@redhat.com>
-
-	* print-message.c:
-	Refactor the printing infrastructure. (#426816)
-
-2007-02-12  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Print migration updates from Ebby Wiselyn
-
-	* print-message.c: (print_response), (org_gnome_print_message),
-	(org_gnome_print_preview):
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues.
-
-2005-08-23  Not Zed  <NotZed@Ximian.com>
-
-	* print-message.c: Add missing headers
-	(org_gnome_print_message): define before defining, remove c99isms.
-	(org_gnome_print_preview): define before defining.
-
-2005-06-27  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries.
-
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* org-gnome-print-message.eplug.xml: Use SOEXT.
-
-2005-06-08 Harish Krishnaswamy <kharish@novell.com>
-	
-	* Makefile.am : Add the correct files to
-	EXTRA_DIST
-
-2005-05-19  Vivek Jain <jvivek@novell.com>
-	
-	Plugin to provide "print" option to composer. Files added:
-	
-	* print-message.c
-	* Makefile.am
-	* org-gnome-print-message.eplug.xml
-	* org-gnome-print-message.xml
-
diff --git a/plugins/print-message/Makefile.am b/plugins/print-message/Makefile.am
deleted file mode 100644
index 73b9d06918..0000000000
--- a/plugins/print-message/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-INCLUDES =						\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/composer                      \
-	$(EVOLUTION_MAIL_CFLAGS)
-
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-print-message.eplug org-gnome-print-message.xml
-plugin_LTLIBRARIES = liborg-gnome-print-message.la
-
-liborg_gnome_print_message_la_SOURCES = print-message.c
-liborg_gnome_print_message_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_print_message_la_LIBADD =			\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/mail/libevolution-mail.la	\
-	$(EVOLUTION_MAIL_LIBS)
-
-EXTRA_DIST = 					\
-	org-gnome-print-message.eplug.xml\
-	org-gnome-print-message.xml
-
-BUILT_SOURCES = org-gnome-print-message.eplug
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/print-message/org-gnome-print-message.eplug.xml b/plugins/print-message/org-gnome-print-message.eplug.xml
deleted file mode 100644
index 839aae2b61..0000000000
--- a/plugins/print-message/org-gnome-print-message.eplug.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<e-plugin-list>
-  <e-plugin
-    type="shlib"
-    id="org.gnome.evolution.plugin.compose.PrintMessage"
-    location="@PLUGINDIR@/liborg-gnome-print-message@SOEXT@"
-    _name="Print Message">
-    <_description>Gives an option to print from the composer.</_description>
-    <author name="Vivek Jain" email="jvivek@novell.com"/>
-
-    <!-- hook into the popup menu -->
-    <hook class="org.gnome.evolution.mail.bonobomenu:1.0">
-      <menu id="org.gnome.evolution.mail.composer" target="widget">
-	      <ui file="@PLUGINDIR@/org-gnome-print-message.xml"/>
-	<item
-	  type="item"
-	  verb="EPPrintPreview"
-	  path="/commands/EPPrintPreview"
-	  enable="one"
-	  activate="org_gnome_print_preview"/>
-	<item
-	  type="item"
-	  verb="EPPrintMessage"
-	  path="/commands/EPPrintMessage"
-	  enable="one"
-	  activate="org_gnome_print_message"/>
-	      </menu>
-    </hook>
-
-  </e-plugin>
-</e-plugin-list>
diff --git a/plugins/print-message/org-gnome-print-message.xml b/plugins/print-message/org-gnome-print-message.xml
deleted file mode 100644
index 49d6f2cfe0..0000000000
--- a/plugins/print-message/org-gnome-print-message.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Root>
-  <commands>
-  <cmd name="EPPrintMessage" _label="_Print..."
-	  _tip="Prints the message" pixtype="stock" pixname="Print"/>
-  <cmd name="EPPrintPreview" _label="Print Pre_view"
-	  pixtype="stock" pixname="Print-Preview"/>
-
-  </commands>
-  <menu>
-  <submenu name="File">
-      <placeholder name="Print">
-	      <menuitem name="EPPrintPreview" verb="" accel="*Control**Shift*p"/>
-	      <menuitem name="EPPrintMessage" verb="" accel="*Control*p"/>
-		      </placeholder>
-   </submenu>
-  </menu>
-</Root>
diff --git a/plugins/print-message/print-message.c b/plugins/print-message/print-message.c
deleted file mode 100644
index e8a7c84be7..0000000000
--- a/plugins/print-message/print-message.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- *  Authors: Vivek Jain <jvivek@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 <gtk/gtk.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <gtkhtml/gtkhtml.h>
-#include "mail/em-format-html-display.h"
-#include "mail/em-format-html-print.h"
-#include <glib.h>
-#include <glib/gi18n.h>
-#include "mail/em-menu.h"
-#include "mail/em-utils.h"
-#include "e-util/e-print.h"
-#include "e-util/e-dialog-utils.h"
-#include "composer/e-msg-composer.h"
-
-void org_gnome_compose_print_message (EPlugin *ep, EMMenuTargetWidget *t);
-void org_gnome_print_message (EPlugin *ep, EMMenuTargetWidget *t);
-void org_gnome_print_preview (EPlugin *ep, EMMenuTargetWidget *t);
-
-void
-org_gnome_print_message (EPlugin *ep, EMMenuTargetWidget *t)
-{
-       	EMsgComposer *composer = (EMsgComposer *)t->target.widget;
-	GtkPrintOperationAction action;
-	CamelMimeMessage *message;
-	EMFormatHTMLPrint *efhp;
-
-	action = GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG;
-	message = e_msg_composer_get_message (composer, 1);
-
-	efhp = em_format_html_print_new (NULL, action);
-	em_format_html_print_raw_message (efhp, message);
-	g_object_unref (efhp);
-}
-
-void
-org_gnome_print_preview (EPlugin *ep, EMMenuTargetWidget *t)
-{
-  	EMsgComposer *composer = (EMsgComposer *)t->target.widget;
-	GtkPrintOperationAction action;
-	CamelMimeMessage *message;
-	EMFormatHTMLPrint *efhp;
-
-	action = GTK_PRINT_OPERATION_ACTION_PREVIEW;
-	message = e_msg_composer_get_message_print (composer, 1);
-
-	efhp = em_format_html_print_new (NULL, action);
-	em_format_html_print_raw_message (efhp, message);
-	g_object_unref (efhp);
-}