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, 7 insertions, 1 deletions

diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 610a35fc53..4b6af39e40 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -33,6 +33,8 @@
 
 #include <libgnomeui/gnome-pixmap.h>
 
+#include <gal/util/e-unicode-i18n.h>
+
 #include "message-tag-followup.h"
 
 static void message_tag_followup_class_init (MessageTagFollowUpClass *class);
@@ -225,13 +227,14 @@ message_tag_followup_encode (struct _FollowUpTag *tag)
 				(unsigned long) tag->completed);
 }
 
+
 const char *
 message_tag_followup_i18n_name (int type)
 {
 	g_return_val_if_fail (type >= 0 && type <= FOLLOWUP_FLAG_NONE, NULL);
 	
 	if (type != FOLLOWUP_FLAG_NONE)
-		return _(available_flags[type].i18n_name);
+		return U_(available_flags[type].i18n_name);
 	else
 		return NULL;
 }
@@ -306,6 +309,9 @@ construct (MessageTagEditor *editor)
 	GladeXML *gui;
 	int i;
 	
+	gtk_window_set_title (GTK_WINDOW (editor), _("Flag to Follow Up"));
+	gnome_window_icon_set_from_file (GTK_WINDOW (editor), EVOLUTION_IMAGES "/flag-for-followup-16.png");
+	
 	gui = glade_xml_new (EVOLUTION_GLADEDIR "/message-tags.glade", "followup_editor");
 	
 	widget = glade_xml_get_widget (gui, "toplevel");