Commit Graph

384 Commits

Author SHA1 Message Date
b6afda1669 Use e_iconv_locale_charset() instead of e_iconv_locale_name(), dunno what
2003-04-09  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (composer_get_default_charset_setting): Use
	e_iconv_locale_charset() instead of e_iconv_locale_name(), dunno
	what I was thinking. locale_name() doesn't even exist.

	* e-msg-composer-attachment-bar.c (get_default_charset): Same.

svn path=/trunk/; revision=20793
2003-04-09 19:30:21 +00:00
c298b9af91 fix build, it's composer_get_default_charset_setting.
2003-04-09  Chris Toshok  <toshok@ximian.com>

	* e-msg-composer.c (setup_ui): fix build, it's
	composer_get_default_charset_setting.

svn path=/trunk/; revision=20782
2003-04-09 10:21:42 +00:00
21fd865ec0 Same as with attachment-bar's get_default_charset(). (setup_ui): Instead
2003-04-09  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (composer_get_default_charset_setting): Same as
	with attachment-bar's get_default_charset().
	(setup_ui): Instead of pulling the default charset from gconf,
	call our helper function above.

	* e-msg-composer-attachment-bar.c (get_default_charset): If gconf
	returns a NULL string, default back to the locale charset.

svn path=/trunk/; revision=20775
2003-04-09 06:06:45 +00:00
55c6c41bd4 Added some debug printfs. (create_composer): Call map_default_cb directly
2003-04-08  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (map_default_cb): Added some debug printfs.
	(create_composer): Call map_default_cb directly instead of having
	it in a "map" callback. Ettore says we shouldn't be doing this
	*shrug*. Still doesn't work tho.

svn path=/trunk/; revision=20767
2003-04-08 20:14:22 +00:00
3b414f4346 [ fixes bug #39763 ] remove the control_entry_focus_{in,out}_event_cb
2003-04-07  Chris Toshok  <toshok@ximian.com>

	[ fixes bug #39763 ]
	* e-msg-composer.c (setup_cut_copy_paste): remove the
	control_entry_focus_{in,out}_event_cb signal stuff.
	(control_entry_focus_in_event_cb): nuke
	(control_entry_focus_in_event_cb): same.

	* e-msg-composer-hdrs.c (create_addressbook_entry): pass the
	contain to bonobo_widget_new_control_from_objref when creating the
	entries.

svn path=/trunk/; revision=20745
2003-04-08 04:56:10 +00:00
7c9645a176 If the composer isn't 'dirty', then don't autosave the draft (no need to).
2003-04-04  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (autosave_save_draft): If the composer isn't
	'dirty', then don't autosave the draft (no need to). Fixes bug
	#40764.

svn path=/trunk/; revision=20671
2003-04-04 18:25:52 +00:00
0b48a811d0 Add a select-all callback and verb. (composer_entry_focus_in_event_cb):
2003-04-03  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (menu_edit_select_all_cb): Add a select-all
	callback and verb.
	(composer_entry_focus_in_event_cb): Set our bonobo-ui verbs.

svn path=/trunk/; revision=20661
2003-04-03 21:39:53 +00:00
d95c0f5a3c Keep track of which entry widget has focus.
2003-04-01  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (composer_entry_focus_in_event_cb): Keep track
	of which entry widget has focus.
	(composer_entry_focus_out_event_cb): Same.
	(control_entry_focus_in_event_cb): Same idea, but since this is in
	another component, tell that component that its widget has focus
	so it can merge bonoboui cut/copy/paste (and anything else) menus.
	(control_entry_focus_out_event_cb): Same.
	(setup_cut_copy_paste): Connect to the focus-in and focus-out
	events for all the entry widgets and the html editor.
	(menu_edit_cut_cb): New callback function since the composer will
	now own the Cut/Copy/Paste menu items sometimes (depending on
	which widget is in focus... confused yet? good).

	* e-msg-composer-hdrs.c (from_changed): Update the Reply-To entry
	to be a normal GtkEntry.
	(create_headers): Same.
	(e_msg_composer_hdrs_set_reply_to): Here too.
	(e_msg_composer_hdrs_get_reply_to): And finally here.

svn path=/trunk/; revision=20623
2003-04-01 23:41:14 +00:00
e20f64823d ** See bug #40300 & probably others.
2003-04-01  Not Zed  <NotZed@Ximian.com>

        ** See bug #40300 & probably others.

        * e-msg-composer.c (autosave_manager_query_load_orphans): make the
        composer arg a parent arg, its only used parent the dialogue.
        Fix caller casts.
        (e_msg_composer_check_autosave): new function, checks for
        autosave files, and recovers them per user instructions.

svn path=/trunk/; revision=20616
2003-04-01 17:24:34 +00:00
0559db3959 Convert to libglade-2's format.
2003-03-31  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer-attachment.glade: Convert to libglade-2's format.

	* e-msg-composer.c (set_editor_signature): E_MSG_COMPOSER_HDRS
	(composer->hdrs)->account->id can never be NULL anymore.

svn path=/trunk/; revision=20604
2003-03-31 22:14:51 +00:00
ce81bdab98 Update for e_notice move
* e-msg-composer.c: Update for e_notice move

svn path=/trunk/; revision=20501
2003-03-25 15:48:48 +00:00
91c10248f8 Fixes for bug #39813
2003-03-20  Jeffrey Stedfast  <fejj@ximian.com>

	Fixes for bug #39813

	* e-msg-composer.c (composer_finalise): Don't unregister the
	signature event handler here.
	(destroy): Unregister it here instead.

svn path=/trunk/; revision=20442
2003-03-20 20:24:40 +00:00
079d44f566 Change the logic to attach text parts when appropriate. (map_default_cb):
2003-03-19  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (add_attachments_handle_mime_part): Change the
	logic to attach text parts when appropriate.
	(map_default_cb): Grab the focus of the To entry widget. Fixes bug
	#39800. Fixes another #warning too.

svn path=/trunk/; revision=20371
2003-03-19 21:28:14 +00:00
e88c74b97d Change the logic to attach text parts when appropriate.
2003-03-19  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (add_attachments_handle_mime_part): Change the
	logic to attach text parts when appropriate.

svn path=/trunk/; revision=20367
2003-03-19 20:28:44 +00:00
e31a8b9678 e_msg_composer_hdrs_get_subject() now returns const so don't g_free() it
2003-03-18  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (do_exit): e_msg_composer_hdrs_get_subject()
	now returns const so don't g_free() it :-)
	(map_default_cb): Same as above. Also, the subject entry no longer
	derives from GnomeCanvas so eliminate the now unneeded casting to
	grab the focus of the subject widget.
	(e_msg_composer_get_subject): Return a const char * now.

	* e-msg-composer-hdrs.c (create_headers): Make the subject entry
	into a GtkEntry so we don't have to worry about i18n and other
	EEntry bugs anymore. Fixes numerous bugs (including #39924).
	(e_msg_composer_hdrs_set_subject): Use gtk_entry_set_text().
	(e_msg_composer_hdrs_to_message_internal):
	e_msg_composer_hdrs_get_subject() now returns const.
	(e_msg_composer_hdrs_get_subject): Return a const char *.
	(entry_changed): e_msg_composer_hdrs_get_subject() now returns
	const.

svn path=/trunk/; revision=20350
2003-03-18 22:11:02 +00:00
e88e730bb6 Default the composer's title to "Create a message". Fixes bug #39696.
2003-03-13  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (create_composer): Default the composer's title
	to "Create a message". Fixes bug #39696.

svn path=/trunk/; revision=20283
2003-03-13 23:04:34 +00:00
4a28f62c6c Don't allow the returned charset to be NULL. (get_file_content): Make sure
2003-03-04  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (composer_get_default_charset_setting): Don't
	allow the returned charset to be NULL.
	(get_file_content): Make sure there is buffered data before trying
	to convert it to UTF-8.

svn path=/trunk/; revision=20139
2003-03-04 18:31:35 +00:00
e5f2139df7 Same as below.
2003-02-25  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c: Same as below.

	* e-msg-composer-attachment-bar.c: Go back to using
	e_iconv_charset_name().

svn path=/trunk/; revision=20059
2003-02-25 20:54:19 +00:00
afea60336c Make sure the url is != NULL? I can't think of anything else in this code
2003-02-24  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (drag_data_received): Make sure the url is !=
	NULL? I can't think of anything else in this code that could
	possibly cause bug #38382.

svn path=/trunk/; revision=20046
2003-02-24 22:15:26 +00:00
1247dfa0f3 Don't save the HTML format setting to gconf. This option menu is meant for
2003-02-22  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (e_msg_composer_set_send_html): Don't save the
	HTML format setting to gconf. This option menu is meant for a
	per-essage setting (ie. once the composer closes, the next
	composer will again use the default and not what the user chose
	last time).

svn path=/trunk/; revision=20004
2003-02-23 04:17:03 +00:00
74171b6c89 Same as below.
2003-02-20  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (composer_get_default_charset_setting): Same as
	below.

	* e-msg-composer-attachment-bar.c (get_default_charset): Use
	camel_charset_canonical_name() rather than e_iconv_charset_name()
	as the latter will be removed shortly.

svn path=/trunk/; revision=19979
2003-02-20 21:46:51 +00:00
1907e1a2d7 default_account is now a string value, not an int.
2003-02-18  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
	default_account is now a string value, not an int.
	(create_from_optionmenu): Same.
	(header_new_recipient): Use g_signal_connect_data() instead of the
	now deprecated gtk_signal_connect_full().

svn path=/trunk/; revision=19934
2003-02-18 20:50:23 +00:00
50ff525b79 clean up
* Makefile.am: clean up

        * e-msg-composer.c (autosave_manager_query_load_orphans): #include
        string.h
        (menu_file_send_cb): s/gtk_signal_emit/g_signal_emit/

        * e-msg-composer-attachment.c: #include string.h
        (e_msg_composer_attachment_edit): s/E_GLADEDIR/EVOLUTION_GLADEDIR
        * e-msg-composer-attachment-bar.c: #include string.h
        (pixbuf_for_mime_type): s/ICONSDIR/IMAGESDIR/

        * e-msg-composer-hdrs.c: #include string.h

        * e-msg-composer-select-file.c (run_selector): Remove unused var

        * evolution-composer.c: #include string.h
        (evolution_composer_init): Remove unused var
        * listener.c: #include string.h
        (listener_new): Remove unused var

svn path=/trunk/; revision=19804
2003-02-06 15:50:31 +00:00
999cf94d61 Split out the mailto handling code from here so we can use it in the
2003-02-05  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (e_msg_composer_new_from_url): Split out the
	mailto handling code from here so we can use it in the drag-n-drop
	code too.
	(drag_data_received): If we find a mailto: url in the
	text/uri-list drop, pass that off to handle_mailto() so it can
	fill in the fields for us.

svn path=/trunk/; revision=19768
2003-02-05 20:16:44 +00:00
a5e82f72f8 updated for e scroll frame --> gtk scrolled window
svn path=/trunk/; revision=19736
2003-02-04 19:03:02 +00:00
8644df4c44 If the subject or body components of the mailto url are not in UTF-8,
2003-01-27  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (e_msg_composer_new_from_url): If the subject
	or body components of the mailto url are not in UTF-8, convert
	them to UTF-8.

svn path=/trunk/; revision=19662
2003-01-28 04:04:51 +00:00
cf7ef09cd0 Load the view menu states from gconf. (e_msg_composer_set_send_html): Save
2003-01-23  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (e_msg_composer_load_config): Load the view
	menu states from gconf.
	(e_msg_composer_set_send_html): Save the setting via gconf instead
	of bonobo-config.
	(e_msg_composer_set_view_from): Same.
	(e_msg_composer_set_view_replyto): Here too.
	(e_msg_composer_set_view_cc): Again here.
	(e_msg_composer_set_view_bcc): And finally here.
	(setup_ui): Fixed a #warning - use gconf instead of bonobo-conf.
	(destroy): No need to sync/destroy the bonobo-conf db, we don't
	use it anymore.

svn path=/trunk/; revision=19606
2003-01-23 22:02:44 +00:00
1ac51fc577 *** empty log message ***
svn path=/trunk/; revision=19555
2003-01-22 20:09:10 +00:00
f4a030d2fa Updated to use EAccountList and iterators. (evolution_composer_init):
2003-01-17  Jeffrey Stedfast  <fejj@ximian.com>

	* evolution-composer.c (impl_Composer_set_headers): Updated to use
	EAccountList and iterators.
	(evolution_composer_init): Updated to use EAccount.

	* e-msg-composer.c (from_changed_cb): Updated to use the EAccount
	object.
	(e_msg_composer_new_with_message): Same.
	(e_msg_composer_get_preferred_account): Updated to return an
	EAccount object.
	(set_editor_signature): Updated to use an EAccountIdentity pointer.
	(get_signature_html): Same.

	* e-msg-composer-hdrs.c (create_from_optionmenu): Updated to use
	EAccount and EAccountList foo.
	(destroy): Same here.
	(e_msg_composer_hdrs_set_from_account): Here too.
	(e_msg_composer_hdrs_get_from): Updated.

svn path=/trunk/; revision=19511
2003-01-17 23:32:07 +00:00
2224fbc745 mail_config_get_signature_list now returns a GSList.
2003-01-16  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (signature_cb): mail_config_get_signature_list
	now returns a GSList.
	(setup_signatures_menu): Same.
	(set_signature_gui): Here too.

svn path=/trunk/; revision=19498
2003-01-16 20:49:18 +00:00
c0e8918f76 (do_exit): Make dialog HIG compliant
[Discard/Cancel/Save].

svn path=/trunk/; revision=19471
2003-01-14 22:50:36 +00:00
47ad4c65d3 use the composer's charset gconf key
svn path=/trunk/; revision=19274
2003-01-08 06:14:52 +00:00
a7c452fa57 Convenience function. (get_file_content): Use the convenience function to
2003-01-07  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (composer_get_default_charset): Convenience
	function.
	(get_file_content): Use the convenience function to get the
	default charset setting.
	(best_charset): Same.
	(e_msg_composer_new): Use gconf to get the send_html setting.
	(e_msg_composer_new_post): Same.

svn path=/trunk/; revision=19269
2003-01-08 01:27:05 +00:00
6221468fa0 fixes
svn path=/trunk/; revision=19206
2003-01-02 20:05:58 +00:00
aed127b4f4 Use camel_text_to_html(). (e_msg_composer_new_from_url): Same.
2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (get_signature_html): Use camel_text_to_html().
	(e_msg_composer_new_from_url): Same.

	* evolution-composer.c (impl_Composer_set_body): Use
	camel_text_to_html().

svn path=/trunk/; revision=19127
2002-12-16 19:23:18 +00:00
6e5686598a Get rid of the unused exception variable.
2002-12-03  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (message_rfc822_dnd): Get rid of the unused
	exception variable.

svn path=/trunk/; revision=18997
2002-12-03 18:45:47 +00:00
aececffc14 removed warning about e_notice. its used too much, its here to stay.
2002-11-27  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer.c (save): removed warning about e_notice.  its
        used too much, its here to stay.

        * *.[ch]: run fix.sh over everything.

svn path=/trunk/; revision=18973
2002-12-02 03:07:59 +00:00
b625bdfa46 s/g_str[n]casecmp/str[n]casecmp
2002-12-01  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c: s/g_str[n]casecmp/str[n]casecmp

svn path=/trunk/; revision=18969
2002-12-01 18:52:28 +00:00
66442571c9 properly chain finalise.
2002-11-26  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer.c (composer_finalise): properly chain finalise.

svn path=/trunk/; revision=18918
2002-11-26 06:39:18 +00:00
7d4c791a79 Duh! dont free subject & simplify logic a little.
2002-11-21  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer.c (subject_changed_cb): Duh!  dont free subject &
        simplify logic a little.

2002-11-20  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer-hdrs.c (entry_changed): duh, emit the signal
        using an initialised value(!).

svn path=/trunk/; revision=18873
2002-11-20 23:46:04 +00:00
ccbfa5da03 applied plain_signature_fix.patch
svn path=/trunk/; revision=18841
2002-11-19 18:42:41 +00:00
6cd18c10d9 dont unref after destroy. duh.
2002-11-19  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer-attachment-bar.c (add_from_file): dont unref
        after destroy. duh.

        * e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_to): Add type
        code to set_property call.
        (e_msg_composer_hdrs_set_cc): "
        (e_msg_composer_hdrs_set_bcc): "
        (e_msg_composer_hdrs_get_to): Do the same for get_property calls.
        (init): ref/sink the tooltip object.
        (e_msg_composer_hdrs_get_type): fix return type.

        * e-msg-composer.c (GNOME_GTKHTML_EDITOR_CONTROL_ID): we want
        version 3.0 not 1.1.
        (create_composer): Add type code to set property call.
        (autosave_manager_query_load_orphans): my bad, we dont unref
        dialog's once we've destroyed 'em.
        (build_message): "
        (get_file_content): "
        (save): "
        (do_exit): "
        (composer_dispose): moved the autosave shutdown here.

svn path=/trunk/; revision=18836
2002-11-19 04:58:22 +00:00
dbcfcb84f3 Remove check for gtk_main_level(). as far as i can tell it serves no real
2002-11-18  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer.c (create_composer): Remove check for
        gtk_main_level().  as far as i can tell it serves no real purpose,
        and i think gtkmain is now redundant.
        (e_msg_composer_new_with_message): Same here.
        (destroy): moved some stuff into finalise, and made destroy
        mulitcall safe.

svn path=/trunk/; revision=18819
2002-11-18 11:19:30 +00:00
d0aff59f86 Removed {BEGIN,END}_GNOME_DECLS.
* listener.h: Removed {BEGIN,END}_GNOME_DECLS.

* e-msg-composer-select-file.c: Do not #include
<libgnome/gnome-defs.h>.
* e-msg-composer.c: Likewise.
* listener.h: Likewise.

svn path=/trunk/; revision=18738
2002-11-13 16:46:43 +00:00
316e12adf3 bonobo api changes.
2002-11-13  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer.c (setup_ui): bonobo api changes.

svn path=/trunk/; revision=18733
2002-11-13 09:39:00 +00:00
234540a383 Fix bonobo object setup.
2002-11-08  Not Zed  <NotZed@Ximian.com>

        * listener.c: Fix bonobo object setup.

        * e-msg-composer-hdrs.c: Remove oaf stuff, fix destroy to be
        multi-call safe.

        * e-msg-composer-attachment.c (e_msg_composer_attachment_new):
        Remove utf8 from locale conversions, & glib api changes.
        (ok_cb): "

        * e-msg-composer-attachment-bar.c (add_from_file): gtk message
        dialog.
        (pixbuf_for_mime_type): glib,gnome-vfs api changes.
        (init): Estimate the icon_height based on the pango font
        description size, this is probably not correct.
        (properties_cb):
        (remove_cb): Changed signature for gnomeui callbacks.
        (popup_icon_context_menu):
        (popup_context_menu): popup_menu api change
        (destroy): Protect from multiple calls.
        (e_msg_composer_attachment_bar_new): Remove push/pop
        visual/colormap stuff.

        * composer-marshal.list: The list of marshallers used by the
        composer.

        * Makefile.am (composer-marshal.h): Added composer marshal builder.

        * evolution-composer.c (class_init): bonobo object epv setup change.
        (factory_fn): Fix changes to factory callback.

        * e-icon-list.c: (icon_get_height): Use bounding box to calc
        height.
        (icon_event): drop gtk_selection_extended.
        (e_icon_list_remove): "
        (select_icon):
        (unselect_icon): "

        * e-msg-composer.c (autosave_save_draft): Dup fd rather than poke
        camel_stream_fd's data.  Also, use camel_stream_close() rather
        than flush.
        (autosave_manager_query_load_orphans): Port to gtk dialog.
        (autosave_query_cb): Removed, redundant.
        (save): Port to gtkdialog.
        (prepare_engine): Fix bonobo-object-client code.
        (get_file_content): gtk dialog
        (do_exit): gtk dialog.
        (setup_signatures_menu): dump gtkutf8 stuff.
        (marshal_NONE__NONE_INT): What WAS jeff thinking?  Removed :)
        (class_init): g object setup.
        (e_msg_composer_get_type): "
        (create_composer): remove bonobo_window_construct, use create
        property instead.  g_signal stuff.  bonobo stuff.
        (is_special_header): Use ascii_strncasecmp
        (e_msg_composer_set_pending_body): gtk->g_object_get/set_data.
        (e_msg_composer_set_body): use ascii_strncasecmp
        (e_msg_composer_add_inline_image_from_mime_part): make cid const.
        (autosave_manager_register):
        (autosave_manager_unregister): Use g_path_get_basename() & account
        for differences.
        (composer_shutdown): rename to finalise/etc.
        (class_init): Use object:finalize instead of shutdown.
        (e_msg_composer_set_body): Use _() rather than U_().
        (build_message): gtk dialog.

2002-11-06  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): Add
        error return to gdk_pixbuf_new_from_file().

svn path=/trunk/; revision=18659
2002-11-08 06:49:14 +00:00
9e8d970488 Add support for an attach option in the mailto: url.
2002-11-01  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (e_msg_composer_new_from_url): Add support for
	an attach option in the mailto: url.

svn path=/trunk/; revision=18489
2002-11-01 20:26:54 +00:00
f3b55ed92d Make sure to save References and In-Reply-To headers. Fixes bug #32932.
2002-10-29  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (e_msg_composer_new_with_message): Make sure to
	save References and In-Reply-To headers. Fixes bug #32932.

svn path=/trunk/; revision=18469
2002-10-30 19:47:20 +00:00
a57815af6b Don't create a new file if the file doesn't exist.
2002-10-02  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (get_file_content): Don't create a new file if
	the file doesn't exist.

svn path=/trunk/; revision=18325
2002-10-04 18:10:44 +00:00
ebbafa91b4 If the user hits cancel when signing/encrypting, don't continue
2002-10-01  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (build_message): If the user hits cancel when
	signing/encrypting, don't continue constructing the message,
	instead abort (and just don't pop up a dialog).

svn path=/trunk/; revision=18291
2002-10-01 21:30:15 +00:00