diff options
use util function to see if the user is the organizer
2002-07-17 <jpr@ximian.com>
* gui/calendar-model.c (calendar_model_value_at): use util
function to see if the user is the organizer
* gui/dialogs/cancel-comp.c (cancel_component_dialog): add
deleting proto to indicate whether cancelling or deleting is the
primary operation
* gui/dialogs/cancel-comp.h: update proto
* gui/dialogs/comp-editor.c (delete_cmd): offer to cancel
* gui/dialogs/task-editor.c (cancel_task_cmd): call
cancel_component_dialog with new param
* gui/dialogs/event-editor.c (cancel_meeting_cmd): ditto
* gui/e-week-view.c (e_week_view_on_editing_stopped): only update
request if user is organizer
(e_week_view_show_popup_menu): disable the meeting and meeting
organizer mask if appropriate
(e_week_view_delete_event_internal): offer to cancel the meeting
(e_week_view_on_cut): ditto
(selection_received): send request if its a meeting
* gui/e-day-view.h: add meeting icon/mask
* gui/e-day-view.c (e_day_view_on_event_right_click): disable the
meeting and meeting organizer mask if appropriate
(e_day_view_delete_event_internal): offer to cancel meeting
(e_day_view_on_cut): ditto
(e_day_view_finish_long_event_resize): only update request if user
is organizer
(e_day_view_reshape_long_event): add meeting icon to count
(e_day_view_reshape_day_event): ditto
(e_day_view_on_top_canvas_drag_data_received): only update request
if user is organizer
(e_day_view_on_main_canvas_drag_data_received): ditto
(selection_received): offer to send meeting info
* gui/e-day-view-main-item.c
(e_day_view_main_item_draw_day_event): draw meeting icon if
appropriate (using dummy icon atm)
svn path=/trunk/; revision=17491
Diffstat (limited to 'calendar/gui/dialogs/comp-editor.c')
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 1179453aff..44e7f80c20 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -47,6 +47,7 @@ #include "delete-comp.h" #include "send-comp.h" #include "changed-comp.h" +#include "cancel-comp.h" #include "comp-editor.h" @@ -379,7 +380,7 @@ save_comp_with_send (CompEditor *editor) if (!save_comp (editor)) return FALSE; - if (send && send_component_dialog (priv->comp, priv->existing_org)) { + if (send && send_component_dialog (priv->comp, !priv->existing_org)) { if (itip_organizer_is_user (priv->comp)) comp_editor_send_comp (editor, CAL_COMPONENT_METHOD_REQUEST); else @@ -1232,8 +1233,13 @@ delete_cmd (GtkWidget *widget, gpointer data) vtype = cal_component_get_vtype (priv->comp); - if (delete_component_dialog (priv->comp, FALSE, 1, vtype, GTK_WIDGET (editor))) + if (delete_component_dialog (priv->comp, FALSE, 1, vtype, GTK_WIDGET (editor))) { + if (itip_organizer_is_user (priv->comp) + && cancel_component_dialog (priv->comp, TRUE)) + itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, priv->comp, priv->client, NULL); + delete_comp (editor); + } } static void |