Set the window title/icon here instead.

2002-04-03  Jeffrey Stedfast  <fejj@ximian.com>

	* message-tag-followup.c (construct): Set the window title/icon
	here instead.

	* message-tag-editor.c (message_tag_editor_init): Don't set the
	title or window icon here, this is a generic class.

	* mail-format.c (handle_multipart_signed): Replace
	get_url_for_icon with the new mail_display_get_url_for_icon
	function.
	(handle_multipart_digest): Here too.
	(get_cid): Use mail_display_add_url instead.
	(get_location): Same.
	(handle_text_enriched): Here too.
	(handle_multipart_signed): And here.

	* message-tag-followup.c (message_tag_followup_i18n_name): Use the
	U_() macro, not the _() macro as it is what we really want.

	* mail-ops.c (mail_send_message): Don't cast the message into a
	CamelMedium before sending anymore.

	* mail-callbacks.c (expunge_folder): Set the followup argument to
	NULL here.
	(done_message_selected): Get the followup value here and pass it
	to the mail-display here.
	(do_mail_fetch_and_print): Again with the NULL followup here.

	* folder-browser.c (folder_browser_set_message_preview): Update to
	pass in NULL as the followup since we are setting the message to
	NULL here.
	(done_message_selected): Get and set the appropriate followup
	value here.
	(do_message_selected): Update to pass in NULL as the followup
	since we are setting the message to NULL here.

	* mail-display.c (mail_display_set_message): Now takes a followup
	tag value.
	(mail_display_init): Set md->followup to NULL.
	(mail_display_destroy): Free md->followup.
	(mail_display_add_url): New: replaces the static add_url function
	originally in mail-format.c
	(mail_display_get_url_for_icon): New: replaces get_url_for_icon
	which was originally in mail-format.c

svn path=/trunk/; revision=16334

1 files changed, 8 insertions, 2 deletions

diff --git a/mail/mail-display.h b/mail/mail-display.h
index aa1960fc8d..0fcd98ab00 100644
--- a/mail/mail-display.h
+++ b/mail/mail-display.h
@@ -36,9 +36,10 @@ struct _MailDisplay {
 	
 	char *selection;
 	
+	struct _FollowUpTag *followup;
 	CamelMimeMessage *current_message;
 	GData **data;
-
+	
 	GHashTable *related;	/* related parts not displayed yet */
 	
 	/* Sigh.  This shouldn't be needed.  I haven't figured out why it is
@@ -76,7 +77,8 @@ void           mail_display_stream_write_when_loaded (MailDisplay *md,
 						      gpointer data);
 
 void           mail_display_set_message (MailDisplay *mail_display, 
-					 CamelMedium *medium);
+					 CamelMedium *medium,
+					 const char *followup);
 
 void           mail_display_set_charset (MailDisplay *mail_display,
 					 const char *charset);
@@ -94,4 +96,8 @@ void           mail_error_printf        (GtkHTML *html,
 					 GtkHTMLStream *stream,
 					 const char *format, ...);
 
+char *mail_display_add_url (MailDisplay *md, const char *kind, char *url, gpointer data);
+
+const char *mail_display_get_url_for_icon (MailDisplay *md, const char *icon_name);
+
 #endif /* _MAIL_DISPLAY_H_ */