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

4 files changed, 5 insertions, 223 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index ca90d40629..b10f2ea2ce 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	* evolution-composer-entries.xml:
+	Remove this file; obsoleted by new composer.
+
 2008-01-28  Andre Klapper  <a9016009@gmx.de>
 
 	* evolution-mail-message.xml: Added translator comments.
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 56743c53e9..f1631f896b 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -2,13 +2,11 @@ XML_FILES =					\
 	evolution.xml				\
 	evolution-addressbook.xml		\
 	evolution-calendar.xml			\
-	evolution-composer-entries.xml		\
 	evolution-mail-message.xml		\
 	evolution-mail-list.xml			\
 	evolution-mail-global.xml		\
 	evolution-mail-messagedisplay.xml	\
 	evolution-memos.xml			\
-	evolution-message-composer.xml		\
 	evolution-signature-editor.xml		\
 	evolution-subscribe.xml			\
 	evolution-event-editor.xml		\
diff --git a/ui/evolution-composer-entries.xml b/ui/evolution-composer-entries.xml
deleted file mode 100644
index f8cc923bf7..0000000000
--- a/ui/evolution-composer-entries.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-  <commands>
-
-    <cmd name="EditCut"
-     _tip="Cut selected text to the clipboard"
-     accel="*Control*x" pixtype="pixbuf"/>
-
-    <cmd name="EditCopy"
-     _tip="Copy selected text to the clipboard"
-     accel="*Control*c" pixtype="pixbuf"/>
-
-    <cmd name="EditPaste"
-     _tip="Paste text from the clipboard"
-     accel="*Control*v" pixtype="pixbuf"/>
-
-    <cmd name="EditSelectAll"
-     _tip="Select all text"
-     accel="*Control*a"/>
-
-  </commands>
-
-  <menu>
-      <submenu name="Edit" _label="_Edit">
-	<placeholder name="EditCutCopyPaste">
-          <menuitem name="EditCut" verb="" _label="Cu_t"/>
-          <menuitem name="EditCopy" verb="" _label="_Copy"/>
-          <menuitem name="EditPaste" verb="" _label="_Paste"/>
-          <separator/>
-	  <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
-        </placeholder>
-      </submenu>
-  </menu>
-
-  <dockitem name="Toolbar">
- 	<toolitem name="EditCut" verb=""  _label="Cut" _tip="Cut selection to clipboard"/>
-	<toolitem name="EditCopy" verb=""  _label="Copy" _tip="Copy selection to clipboard"/>
-	<toolitem name="EditPaste" verb=""  _label="Paste" _tip="Paste from clipboard"/>
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
deleted file mode 100644
index 0533a0e486..0000000000
--- a/ui/evolution-message-composer.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<Root>
-	<commands>
-
-	        <cmd name="FileOpen" _label="Open" hidden="1"
-		_tip="Open a file" pixtype="pixbuf" accel="*Control*o"/>
-		
-	        <cmd name="FileSave" _label="Save"
-		_tip="Save the current file" pixtype="pixbuf"
-		accel="*Ctrl*s"/>
-
-		<cmd name="FileSaveDraft" _label="Save Draft"
-		_tip="Save as draft" pixtype="pixbuf"
-		accel="*Ctrl**Shift*s"/>
-
-	        <cmd name="FileSaveAs" _label="Save As"
-	        _tip="Save the current file with a different name"
-		pixtype="pixbuf"/>
-		
-	        <cmd name="FileClose" _label="Close"
-		_tip="Close the current file" pixtype="pixbuf"
-		accel="*Ctrl*w"/>
-		
-		<cmd name="FileSaveInFolder" _label="Save in folder..."
-		_tip="Save the message in a specified folder"/>
-
-		<cmd name="FileSend" _label="Send" _tip="Send this message"
-		accel="*Ctrl*Return"
-                pixtype="pixbuf"/>
-		
-		<cmd name="FileAttach" _label="Attach" _tip="Attach a file"
-		accel="*Ctrl*m"
-		pixtype="pixbuf"/>
-		
-		<cmd name="DeleteAll" _label="_Delete all"
-		pixtype="pixbuf"
-		_tip="Delete all but signature"/>
-
-		<cmd name="RequestReceipt" _label="R_equest Read Receipt"
-		     _tip="Get delivery notification when your message is read"
-		     type="toggle" state="0"/>
-	     
-	        <cmd name="SetPriority" _label="_Prioritize Message"
-		     _tip="Set the message priority to high"
-		     type="toggle" state="0"/>
-		
-		<cmd name="FormatHtml" _label="HT_ML" _tip="Send the mail in HTML format"
-		type="toggle" state="0"/> 
-		
-		<cmd name="ViewFrom" _label="_From Field"
-		_tip="Toggles whether the From chooser is displayed" type="toggle" state="0"/>
-		
-                <cmd name="ViewTo" _label="_To Field"
-		_tip="Toggles whether the To field is displayed"
-		type="toggle" state="0"/>
-
-                <cmd name="ViewPostTo" _label="_Post-To Field"
-		_tip="Toggles whether the Post-To field is displayed"
-		type="toggle" state="0"/>
-
-                <cmd name="ViewReplyTo" _label="_Reply-To Field"
-		_tip="Toggles whether the Reply-To field is displayed"
-		type="toggle" state="0"/>
-		
-		<cmd name="ViewCC" _label="_Cc Field"
-		_tip="Toggles whether the CC field is displayed"
-		type="toggle" state="0"/>
-			    
-		<cmd name="ViewBCC" _label="_Bcc Field"
-		_tip="Toggles whether the BCC field is displayed"
-		type="toggle" state="0"/>
-		
-		
-                <cmd name="SecurityPGPSign" _label="PGP Sign" _tip="Sign this message with your PGP key"
-		type="toggle" state="0"/>
-		
-                <cmd name="SecurityPGPEncrypt" _label="PGP Encrypt" _tip="Encrypt this message with PGP"
-		type="toggle" state="0"/>
-		
-                <cmd name="SecuritySMimeSign" _label="S/MIME Sign" 
-                _tip="Sign this message with your S/MIME Signature Certificate"
-		type="toggle" state="0" hidden="1"/>
-		
-                <cmd name="SecuritySMimeEncrypt" _label="S/MIME Encrypt" 
-                _tip="Encrypt this message with your S/MIME Encryption Certificate"
-		type="toggle" state="0" hidden="1"/>
-		
-		<cmd name="InsertXSendOptions" _tip="Insert Send options"/>
-
-	</commands>
-	
-        <keybindings>
-	
-        </keybindings>
-	
-	<menu>
-		<submenu name="File" _label="_File">
-			<menuitem name="FileOpen" verb="" _label="_Open..."/>
-			<placeholder name="FileOps"/>
-			<menuitem name="FileSend" verb="" _label="S_end"/>
-
-			<separator f="" name="emailcomposer1"/>
-
-			<menuitem name="FileSave" verb="" _label="_Save"/>
-			<menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
-                        <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/>
-			<placeholder name="Print" delimit="top"/>
-
-			<separator f="" name="emailcomposer2"/>
-
-			<menuitem name="FileClose" verb="" _label="_Close"/>
-		</submenu>
-		
-		<submenu name="Edit" _label="_Edit">
-			 <placeholder name="EditUndoRedo"/>
-			 <separator f="" name="emailcomposer1"/>
-			 <placeholder name="EditCutCopyPaste"/>
-			 <separator f="" name="emailcomposer2"/>
-			 <placeholder name="EditFindReplace"/>
-			 <separator f="" name="emailcomposer3"/>
-      			 <placeholder name="EncodingPlaceholder"/>
-			 <separator f="" name="emailcomposer4"/>
-			 <placeholder name="EditMisc"/>
-		</submenu>
-		
-		<submenu name="View" _label="_View">
-	                <menuitem name="ViewFrom" verb=""/>
-			<menuitem name="ViewTo" verb=""/>
-			<menuitem name="ViewPostTo" verb=""/>
-                        <menuitem name="ViewReplyTo" verb=""/>
-	                <menuitem name="ViewCC" verb=""/>
-	                <menuitem name="ViewBCC" verb=""/>
-		</submenu>
-		
-                <submenu name="Insert" _label="I_nsert">
-	                <menuitem name="FileAttach" verb=""
-	                _label="_Attachment..."/>
-			<separator/>
-			<menuitem name="InsertXSendOptions" verb="" _label="_Send Options"/>
-			<separator/>
-                	<placeholder name="Component"/>
-			<separator f="" name="emailcomposer"/>
-			<menuitem name="RequestReceipt" verb=""/>
-			<menuitem name="SetPriority" verb=""/>
-                </submenu>
-		
-		<submenu name="Format" _label="For_mat">
-			<menuitem name="FormatHtml" verb=""/>
-		
-			<separator/>
-			<placeholder name="FormatParagraph"/>
-		</submenu>
-		
-                <submenu name="Security" _label="_Security">
-                        <menuitem name="SecurityPGPSign" verb="" _label="PGP _Sign"/>
-                        <menuitem name="SecurityPGPEncrypt" verb="" _label="PGP _Encrypt"/>
-                        <menuitem name="SecuritySMimeSign" verb="" _label="S/MIME Sig_n"/>
-                        <menuitem name="SecuritySMimeEncrypt" verb="" _label="S/MIME En_crypt"/>
-                </submenu>
-		
-	</menu>
-	
-	<dockitem name="Toolbar" behavior="exclusive" look="system">
-		<toolitem name="FileSend" verb="" pixtype="pixbuf" priority="1"/>
-		<separator f="" name="emailcomposer2"/>
-		<toolitem name="FileSaveDraft" verb="" pixtype="pixbuf" priority="1"/>
-		<toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/>	
-
-		<separator f="" name="emailcomposer"/>
-	</dockitem>	
-</Root>
-
-
-
-
-
-
-
-
-
-
-