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

diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index c41171cfe4..3c84af929f 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -58,7 +58,7 @@ const gchar *itip_strip_mailto (const gchar *address);
 char *itip_get_comp_attendee (ECalComponent *comp, ECal *client);
 
 gboolean itip_send_comp (ECalComponentItipMethod method, ECalComponent *comp,
-			 ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users);
+			 ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users, gboolean strip_alarms);
 
 gboolean itip_publish_comp (ECal *client, gchar* uri, gchar* username,
 			    gchar* password, ECalComponent **pub_comp);