** Fix for bug #225712

2009-01-19  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #225712

	* calendar/gui/dialogs/comp-editor.h: (CompEditorClass::send_comp),
	(comp_editor_send_comp): Changed function prototypes.
	* calendar/gui/dialogs/comp-editor.c: (real_send_comp), (save_comp_with_send),
	(comp_editor_send_comp): Strip alarms based on user's choice.
	* calendar/gui/dialogs/send-comp.h: (send_component_dialog):
	* calendar/gui/dialogs/send-comp.c: (have_nonprocedural_alarm),
	(send_component_dialog): Show option "Send my alarms with this event"
	when prompting to send event or not, but only if have any non-procedure
	alarms and if it the caller want to know user's opinion. Default is
	to strip all alarms. Procedure alarms are always strip out.
	* calendar/gui/dialogs/event-editor.c: (event_editor_send_comp):
	* calendar/gui/dialogs/task-editor.c: (task_editor_send_comp):
	Honor function prototype changes and use new parameter strip_alarms.
	* calendar/gui/itip-utils.h: (itip_send_comp):
	* calendar/gui/itip-utils.c: (comp_compliant), (itip_send_comp),
	(reply_to_calendar_comp):
	New parameter to strip all alarms or only procedure alarms.
	* calendar/gui/tasks-control.c: (tasks_control_forward_cmd):
	* calendar/gui/e-itip-control.c: (send_item), (send_freebusy), (ok_clicked_cb):
	* calendar/gui/e-calendar-table.c: (e_calendar_table_on_forward):
	* calendar/gui/e-memo-table.c: (e_memo_table_on_forward):
	* calendar/gui/e-calendar-view.c: (e_calendar_view_cut_clipboard),
	(delete_event), (e_calendar_view_delete_selected_occurrence),
	(on_forward):
	Always strip alarms when sending component.
	* calendar/gui/e-calendar-view.c: (e_calendar_view_add_event),
	(e_calendar_view_modify_and_send):
	* calendar/gui/e-cal-model-calendar.c: (ecmc_set_value_at):
	Strip alarms based on user's choice.

	* plugins/itip-formatter/itip-view.h:
	* plugins/itip-formatter/itip-view.c: (itip_view_set_show_keep_alarm_check),
	(itip_view_get_keep_alarm_check_state),
	(itip_view_set_show_inherit_alarm_check),
	(itip_view_get_inherit_alarm_check_state): New functions to new
	options to either inherit reminder from the incoming event or to
	preserve users reminders in already existing event in the calendar.
	* plugins/itip-formatter/itip-view.c: (struct _ItipViewPrivate), (alarm_check_toggled_cb),
	(itip_view_init): Properly initialize new option's members.
	* plugins/itip-formatter/itip-formatter.c: (find_cal_opened_cb), (update_item),
	(send_comp_to_attendee), (update_attendee_status), (send_item),
	(extract_itip_data), (view_response_cb), (format_itip_object):
	Setup new options based on the actual data.


svn path=/trunk/; revision=37097

1 files changed, 4 insertions, 4 deletions

diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index ca6959640b..4b8f8698b9 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -88,7 +88,7 @@ static const gchar *ui =
 "</ui>";
 
 static void task_editor_edit_comp (CompEditor *editor, ECalComponent *comp);
-static gboolean task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method);
+static gboolean task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms);
 
 G_DEFINE_TYPE (TaskEditor, task_editor, TYPE_COMP_EDITOR)
 
@@ -446,7 +446,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 }
 
 static gboolean
-task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
+task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms)
 {
 	TaskEditorPrivate *priv;
 	ECalComponent *comp = NULL;
@@ -465,7 +465,7 @@ task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 
 		client = e_meeting_store_get_e_cal (priv->model);
 		result = itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-				client, NULL, NULL, NULL);
+				client, NULL, NULL, NULL, strip_alarms);
 		g_object_unref (comp);
 
 		if (!result)
@@ -474,7 +474,7 @@ task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 
  parent:
 	if (COMP_EDITOR_CLASS (task_editor_parent_class)->send_comp)
-		return COMP_EDITOR_CLASS (task_editor_parent_class)->send_comp (editor, method);
+		return COMP_EDITOR_CLASS (task_editor_parent_class)->send_comp (editor, method, strip_alarms);
 
 	return FALSE;
 }