fixes #258786.

svn path=/trunk/; revision=30451

7 files changed, 26 insertions, 6 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1d446aaa75..c8072916f7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,16 @@
 2005-09-30  Viren.L  <lviren@novell.com>
 
+	Fixes #258786
+	* gui/e-cal-popup.[ch] (e_cal_popup_target_new_select) : Added 
+	E_CAL_POPUP_SELECT_NOTCOMPLETE flag.
+	* gui/e-cal-menu.[ch] (e_cal_menu_target_new_select) : Added 
+	E_CAL_MENU_SELECT_NOTCOMPLETE flag.
+	* gui/tasks-control.c (tasks_sensitize_table):
+	* gui/e-calendar-table.c (tasks_popup_items): Added the NOT_COMPLETE
+	flag.
+
+2005-09-30  Viren.L  <lviren@novell.com>
+
 	Fixes #314599.
 	* gui/dialogs/recurrence-page.c (clear_widgets):
 	Changed parameter ENDING_FOREVER to ENDING_FOR while invoking 
diff --git a/calendar/gui/e-cal-menu.c b/calendar/gui/e-cal-menu.c
index 7a177d6017..25d4f5a554 100644
--- a/calendar/gui/e-cal-menu.c
+++ b/calendar/gui/e-cal-menu.c
@@ -146,8 +146,11 @@ e_cal_menu_target_new_select(ECalMenu *eabp, struct _ECalModel *model, GPtrArray
 
 		if (!e_cal_get_static_capability (comp_data->client, CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT)
 		    && !e_cal_get_static_capability (comp_data->client, CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK)
-		    && !icalcomponent_get_first_property (comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY))
+		    && !icalcomponent_get_first_property (comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY)) 
 			mask &= ~E_CAL_MENU_SELECT_ASSIGNABLE;
+		
+		if (!icalcomponent_get_first_property (comp_data->icalcomp, ICAL_COMPLETED_PROPERTY))
+			mask &= ~ E_CAL_MENU_SELECT_NOTCOMPLETE;
 
 		if (e_cal_util_component_has_recurrences (comp_data->icalcomp))
 			mask &= ~E_CAL_MENU_SELECT_RECURRING;
@@ -239,6 +242,7 @@ static const EMenuHookTargetMask ecalph_select_masks[] = {
 	{ "not-meeting", E_CAL_MENU_SELECT_NOTMEETING },
 	{ "assignable", E_CAL_MENU_SELECT_ASSIGNABLE },
 	{ "hasurl", E_CAL_MENU_SELECT_HASURL },
+	{ "not-complete", E_CAL_MENU_SELECT_NOTCOMPLETE },
 	{ 0 }
 };
 
diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h
index bb34a07ebd..5d27b26198 100644
--- a/calendar/gui/e-cal-menu.h
+++ b/calendar/gui/e-cal-menu.h
@@ -72,6 +72,7 @@ enum _e_cal_menu_target_select_t {
 
 	E_CAL_MENU_SELECT_ASSIGNABLE = 1<<10,
 	E_CAL_MENU_SELECT_HASURL = 1<<11,
+	E_CAL_MENU_SELECT_NOTCOMPLETE = 1<<12,
 };
 
 typedef struct _ECalMenuTargetSelect ECalMenuTargetSelect;
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 8cebaaf8c3..2ceeeb63ad 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -268,7 +268,10 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr
 		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING) &&
 				needs_to_accept (comp_data->icalcomp, user_email))
 			mask &= ~E_CAL_POPUP_SELECT_ACCEPTABLE;
-		
+
+		if (!icalcomponent_get_first_property (comp_data->icalcomp, ICAL_COMPLETED_PROPERTY))
+			mask &= ~E_CAL_POPUP_SELECT_NOTCOMPLETE;
+
 		g_object_unref (comp);
 		g_free (user_email);
 	}
@@ -422,6 +425,7 @@ static const EPopupHookTargetMask ecalph_select_masks[] = {
 	{ "hasurl", E_CAL_POPUP_SELECT_HASURL },
 	{ "delegate", E_CAL_POPUP_SELECT_DELEGATABLE }, 
 	{ "accept", E_CAL_POPUP_SELECT_ACCEPTABLE },
+	{ "not-complete", E_CAL_POPUP_SELECT_NOTCOMPLETE },
 	{ 0 }
 };
 
diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h
index 72f3928139..5dac5ea77e 100644
--- a/calendar/gui/e-cal-popup.h
+++ b/calendar/gui/e-cal-popup.h
@@ -85,6 +85,7 @@ enum _e_cal_popup_target_select_t {
 	E_CAL_POPUP_SELECT_MEETING = 1 <<12,
 	E_CAL_POPUP_SELECT_DELEGATABLE = 1<<13,
 	E_CAL_POPUP_SELECT_ACCEPTABLE = 1<<14,
+	E_CAL_POPUP_SELECT_NOTCOMPLETE = 1<<15,
 };
 
 /**
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 6ea5514f45..f789fe40d8 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1175,7 +1175,7 @@ static EPopupItem tasks_popup_items [] = {
 
 	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
 	{ E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
 	{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE },
 
 	{ E_POPUP_BAR, "c0.bar" },
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 927035c3a8..ccf09a87f2 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -169,8 +169,8 @@ static struct _tasks_sensitize_item tasks_sensitize_table[] = {
 	{ "TasksCopy", E_CAL_MENU_SELECT_ANY },
 	{ "TasksPaste", E_CAL_MENU_SELECT_EDITABLE },
 	{ "TasksDelete", E_CAL_MENU_SELECT_ANY | E_CAL_MENU_SELECT_EDITABLE },
-	{ "TasksMarkComplete", E_CAL_MENU_SELECT_ANY | E_CAL_MENU_SELECT_EDITABLE },
-	{ "TasksPurge", E_CAL_MENU_SELECT_EDITABLE },
+	{ "TasksMarkComplete", E_CAL_MENU_SELECT_ANY | E_CAL_MENU_SELECT_EDITABLE | E_CAL_MENU_SELECT_NOTCOMPLETE},
+	{ "TasksPurge",  E_CAL_MENU_SELECT_EDITABLE },
 	{ "TasksAssign", E_CAL_MENU_SELECT_ONE | E_CAL_MENU_SELECT_EDITABLE | E_CAL_MENU_SELECT_ASSIGNABLE },
 	{ "TasksForward", E_CAL_MENU_SELECT_ONE },
 	{ 0 }
@@ -439,7 +439,6 @@ tasks_control_purge_cmd	(BonoboUIComponent	*uic,
 	ETasks *tasks;
 
 	tasks = E_TASKS (data);
-	
 	if (confirm_purge (tasks))
 	    e_tasks_delete_completed (tasks);
 }