[evolution] Bug 602799 - "Mark for Follow Up" menu item glitches

[Matthew Barnes <mbarnes src gnome org>]

commit 7a086cbcd0592e4c133c5761c65fa291b6d05d04
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Nov 25 09:20:19 2009 -0500

    Bug 602799 - "Mark for Follow Up" menu item glitches

 mail/e-mail-reader.c |   25 ++++++++++++++++++++++++-
 ui/evolution-mail.ui |    2 ++
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 847ffd2..f70b32a 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1582,6 +1582,14 @@ static EPopupActionEntry mail_reader_popup_entries[] = {
 	  NULL,
 	  "mail-delete" },
 
+	{ "mail-popup-flag-clear",
+	  NULL,
+	  "mail-flag-clear" },
+
+	{ "mail-popup-flag-completed",
+	  NULL,
+	  "mail-flag-completed" },
+
 	{ "mail-popup-flag-for-followup",
 	  N_("Mark for Follo_w Up..."),
 	  "mail-flag-for-followup" },
@@ -2124,6 +2132,21 @@ mail_reader_update_actions (EMailReader *reader)
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
+	action_name = "mail-flag-clear";
+	sensitive = enable_flag_clear;
+	action = e_mail_reader_get_action (reader, action_name);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action_name = "mail-flag-completed";
+	sensitive = enable_flag_completed;
+	action = e_mail_reader_get_action (reader, action_name);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action_name = "mail-flag-for-followup";
+	sensitive = enable_flag_for_followup;
+	action = e_mail_reader_get_action (reader, action_name);
+	gtk_action_set_sensitive (action, sensitive);
+
 	action_name = "mail-forward";
 	sensitive = have_an_account && any_messages_selected;
 	action = e_mail_reader_get_action (reader, action_name);
@@ -2727,7 +2750,7 @@ e_mail_reader_check_state (EMailReader *reader)
 			can_clear_flags = TRUE;
 			tag = camel_message_info_user_tag (
 				info, "completed-on");
-			if (tag != NULL && *tag != '\0')
+			if (tag == NULL || *tag == '\0')
 				can_flag_completed = TRUE;
 		} else
 			can_flag_for_followup = TRUE;
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 0964971..f2c162c 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -101,6 +101,8 @@
     <menuitem action='mail-popup-mark-junk'/>
     <menuitem action='mail-popup-mark-notjunk'/>
     <menuitem action='mail-popup-flag-for-followup'/>
+    <menuitem action="mail-popup-flag-clear"/>
+    <menuitem action="mail-popup-flag-completed"/>
     <menu action='mail-label-menu'>
       <menuitem action='mail-label-none'/>
       <separator/>