** 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, 54 insertions, 20 deletions

diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index 55f525326e..21a961d746 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -1,10 +1,35 @@
+/* -*- 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.
+ */
+
 #include "e-composer-from-header.h"
 
 /* Convenience macro */
 #define E_COMPOSER_FROM_HEADER_GET_COMBO_BOX(header) \
 	(E_ACCOUNT_COMBO_BOX (E_COMPOSER_HEADER (header)->input_widget))
 
+enum {
+	REFRESHED,
+	LAST_SIGNAL
+};
+
 static gpointer parent_class;
+static guint signal_ids[LAST_SIGNAL];
 
 static void
 composer_from_header_changed_cb (EAccountComboBox *combo_box,
@@ -14,9 +39,24 @@ composer_from_header_changed_cb (EAccountComboBox *combo_box,
 }
 
 static void
+composer_from_header_refreshed_cb (EAccountComboBox *combo_box,
+                                   EComposerFromHeader *header)
+{
+	g_signal_emit (header, signal_ids[REFRESHED], 0);
+}
+
+static void
 composer_from_header_class_init (EComposerFromHeaderClass *class)
 {
 	parent_class = g_type_class_peek_parent (class);
+
+	signal_ids[REFRESHED] = g_signal_new (
+		"refreshed",
+		G_TYPE_FROM_CLASS (class),
+		G_SIGNAL_RUN_LAST,
+		0, NULL, NULL,
+		g_cclosure_marshal_VOID__VOID,
+		G_TYPE_NONE, 0);
 }
 
 static void
@@ -28,8 +68,10 @@ composer_from_header_init (EComposerFromHeader *header)
 	g_signal_connect (
 		widget, "changed",
 		G_CALLBACK (composer_from_header_changed_cb), header);
+	g_signal_connect (
+		widget, "refreshed",
+		G_CALLBACK (composer_from_header_refreshed_cb), header);
 	E_COMPOSER_HEADER (header)->input_widget = widget;
-	gtk_widget_show (widget);
 }
 
 GType
@@ -67,6 +109,17 @@ e_composer_from_header_new (const gchar *label)
 		"button", FALSE, NULL);
 }
 
+EAccountList *
+e_composer_from_header_get_account_list (EComposerFromHeader *header)
+{
+	EAccountComboBox *combo_box;
+
+	g_return_val_if_fail (E_IS_COMPOSER_FROM_HEADER (header), NULL);
+
+	combo_box = E_COMPOSER_FROM_HEADER_GET_COMBO_BOX (header);
+	return e_account_combo_box_get_account_list (combo_box);
+}
+
 void
 e_composer_from_header_set_account_list (EComposerFromHeader *header,
                                          EAccountList *account_list)
@@ -124,22 +177,3 @@ e_composer_from_header_set_active_name (EComposerFromHeader *header,
 	combo_box = E_COMPOSER_FROM_HEADER_GET_COMBO_BOX (header);
 	return e_account_combo_box_set_active_name (combo_box, account_name);
 }
-
-CamelInternetAddress *
-e_composer_from_header_get_active_address (EComposerFromHeader *header)
-{
-	CamelInternetAddress *address;
-	EAccount *account;
-
-	g_return_val_if_fail (E_IS_COMPOSER_FROM_HEADER (header), NULL);
-
-	account = e_composer_from_header_get_active (header);
-	if (account == NULL)
-		return NULL;
-
-	address = camel_internet_address_new ();
-	camel_internet_address_add (
-		address, account->id->name, account->id->address);
-
-	return address;
-}