Updated to use the new Follow-Up tags. Instead of storing a string

2002-08-02  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-display.c (mail_display_render): Updated to use the new
	Follow-Up tags. Instead of storing a string containing the
	follow-up tag value, we now have to store the CamelMessageInfo.
	(mail_display_destroy): Unref the folder and the message-info.

	* folder-browser.c (followup_tag_complete): No longer needed.
	(on_right_clicked): Use the individual follow-up tags to decide
	whether or not to enable something.

	* message-list.c (ml_tree_value_at): Update to use the new
	Follow-Up tags.

	* mail-callbacks.c (flag_for_followup): Update to use the new
	MessageTagEditor API.
	(tag_editor_ok): Update this too.
	(flag_followup_completed): Updated this too.
	(flag_followup_clear): Set all the follow-up tag values to "".

svn path=/trunk/; revision=17691

1 files changed, 7 insertions, 33 deletions

diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h
index d7a369e75f..025e3d4cba 100644
--- a/mail/message-tag-followup.h
+++ b/mail/message-tag-followup.h
@@ -36,29 +36,10 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#define MESSAGE_TAG_FOLLOWUP(obj)	  GTK_CHECK_CAST (obj, message_tag_followup_get_type (), MessageTagFollowUp)
-#define MESSAGE_TAG_FOLLOWUP_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, message_tag_followup_get_type (), MessageTagFollowUpClass)
-#define IS_MESSAGE_TAG_FOLLOWUP(obj)      GTK_CHECK_TYPE (obj, message_tag_followup_get_type ())
-
-enum {
-	FOLLOWUP_FLAG_CALL,
-	FOLLOWUP_FLAG_DO_NOT_FORWARD,
-	FOLLOWUP_FLAG_FOLLOWUP,
-	FOLLOWUP_FLAG_FYI,
-	FOLLOWUP_FLAG_FORWARD,
-	FOLLOWUP_FLAG_NO_RESPONSE_NECESSARY,
-	FOLLOWUP_FLAG_READ,
-	FOLLOWUP_FLAG_REPLY,
-	FOLLOWUP_FLAG_REPLY_ALL,
-	FOLLOWUP_FLAG_REVIEW,
-	FOLLOWUP_FLAG_NONE
-};
-
-struct _FollowUpTag {
-	int type;
-	time_t target_date;
-	time_t completed;
-};
+#define MESSAGE_TAG_FOLLOWUP_TYPE         (message_tag_followup_get_type ())
+#define MESSAGE_TAG_FOLLOWUP(obj)	  (GTK_CHECK_CAST (obj, MESSAGE_TAG_FOLLOWUP_TYPE, MessageTagFollowUp))
+#define MESSAGE_TAG_FOLLOWUP_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, MESSAGE_TAG_FOLLOWUP_TYPE, MessageTagFollowUpClass))
+#define IS_MESSAGE_TAG_FOLLOWUP(obj)      (GTK_CHECK_TYPE (obj, MESSAGE_TAG_FOLLOWUP_TYPE))
 
 typedef struct _MessageTagFollowUp MessageTagFollowUp;
 typedef struct _MessageTagFollowUpClass MessageTagFollowUpClass;
@@ -66,17 +47,15 @@ typedef struct _MessageTagFollowUpClass MessageTagFollowUpClass;
 struct _MessageTagFollowUp {
 	MessageTagEditor parent;
 	
-	struct _FollowUpTag *tag;
-	char *value;
-	
 	GtkCList *message_list;
 	
-	GtkOptionMenu *type;
-	GtkWidget *none;
+	GtkCombo *combo;
 	
 	EDateEdit *target_date;
 	GtkToggleButton *completed;
 	GtkButton *clear;
+	
+	time_t completed_date;
 };
 
 struct _MessageTagFollowUpClass {
@@ -89,11 +68,6 @@ struct _MessageTagFollowUpClass {
 
 GtkType message_tag_followup_get_type (void);
 
-/* utility functions */
-struct _FollowUpTag *message_tag_followup_decode (const char *tag_value);
-char *message_tag_followup_encode (struct _FollowUpTag *followup);
-const char *message_tag_followup_i18n_name (int type);
-
 MessageTagEditor *message_tag_followup_new (void);
 
 void message_tag_followup_append_message (MessageTagFollowUp *editor,