diff --git a/src/gcal-edit-dialog.c b/src/gcal-edit-dialog.c index f7ec8a2a..e74bac9a 100644 --- a/src/gcal-edit-dialog.c +++ b/src/gcal-edit-dialog.c @@ -914,7 +914,7 @@ remove_button_clicked (GtkButton *button, gcal_event_remove_alarm (event, trigger_minutes); - gcal_manager_update_event (self->manager, event, E_CAL_OBJ_MOD_THIS); + gcal_manager_update_event (self->manager, event, GCAL_RECURRENCE_MOD_THIS_ONLY); gtk_widget_destroy (row); diff --git a/src/gcal-manager.c b/src/gcal-manager.c index 93a645f3..ac62d76f 100644 --- a/src/gcal-manager.c +++ b/src/gcal-manager.c @@ -1750,14 +1750,14 @@ gcal_manager_create_event (GcalManager *manager, * gcal_manager_update_event: * @manager: a #GcalManager * @event: a #GcalEvent - * @mod: an #ECalObjModType + * @mod: an #GcalRecurrenceModType * * Saves all changes made to @event persistently. */ void -gcal_manager_update_event (GcalManager *manager, - GcalEvent *event, - ECalObjModType mod) +gcal_manager_update_event (GcalManager *manager, + GcalEvent *event, + GcalRecurrenceModType mod) { GcalManagerUnit *unit; ECalComponent *component; @@ -1776,7 +1776,7 @@ gcal_manager_update_event (GcalManager *manager, * the rid to NULL when modifying a recurrent event with MOD_ALL * modtype. */ - if (mod == E_CAL_OBJ_MOD_ALL) + if (mod == GCAL_RECURRENCE_MOD_ALL) e_cal_component_set_recurid (component, NULL); /* @@ -1788,7 +1788,7 @@ gcal_manager_update_event (GcalManager *manager, e_cal_client_modify_object (unit->client, e_cal_component_get_icalcomponent (component), - mod, + (ECalObjModType) mod, NULL, on_event_updated, component); @@ -1800,14 +1800,14 @@ gcal_manager_update_event (GcalManager *manager, * gcal_manager_remove_event: * @manager: a #GcalManager * @event: a #GcalEvent - * @mod: an #ECalObjModType + * @mod: an #GcalRecurrenceModType * * Deletes @event. */ void -gcal_manager_remove_event (GcalManager *manager, - GcalEvent *event, - ECalObjModType mod) +gcal_manager_remove_event (GcalManager *manager, + GcalEvent *event, + GcalRecurrenceModType mod) { GcalManagerUnit *unit; ECalComponent *component; @@ -1837,8 +1837,8 @@ gcal_manager_remove_event (GcalManager *manager, e_cal_client_remove_object (unit->client, uid, - mod == E_CAL_OBJ_MOD_ALL ? NULL : rid, - mod, + mod == GCAL_RECURRENCE_MOD_ALL ? NULL : rid, + (ECalObjModType) mod, manager->async_ops, on_event_removed, component); diff --git a/src/gcal-manager.h b/src/gcal-manager.h index 63a2f034..9238c57b 100644 --- a/src/gcal-manager.h +++ b/src/gcal-manager.h @@ -74,13 +74,13 @@ gboolean gcal_manager_is_client_writable (GcalManager void gcal_manager_create_event (GcalManager *manager, GcalEvent *event); -void gcal_manager_update_event (GcalManager *manager, - GcalEvent *event, - ECalObjModType mod); +void gcal_manager_update_event (GcalManager *manager, + GcalEvent *event, + GcalRecurrenceModType mod); -void gcal_manager_remove_event (GcalManager *manager, - GcalEvent *event, - ECalObjModType mod); +void gcal_manager_remove_event (GcalManager *manager, + GcalEvent *event, + GcalRecurrenceModType mod); void gcal_manager_move_event_to_source (GcalManager *manager, GcalEvent *event, diff --git a/src/gcal-recurrence.h b/src/gcal-recurrence.h index 00b19798..a4530a46 100644 --- a/src/gcal-recurrence.h +++ b/src/gcal-recurrence.h @@ -47,6 +47,13 @@ typedef enum GCAL_RECURRENCE_UNTIL } GcalRecurrenceLimitType; +typedef enum +{ + GCAL_RECURRENCE_MOD_THIS_ONLY = E_CAL_OBJ_MOD_THIS, + GCAL_RECURRENCE_MOD_THIS_AND_FUTURE = E_CAL_OBJ_MOD_THIS_AND_FUTURE, + GCAL_RECURRENCE_MOD_ALL = E_CAL_OBJ_MOD_ALL, +} GcalRecurrenceModType; + struct _GcalRecurrence { gint ref_count; diff --git a/src/gcal-utils.c b/src/gcal-utils.c index 7e369f42..cbe91595 100644 --- a/src/gcal-utils.c +++ b/src/gcal-utils.c @@ -1169,7 +1169,7 @@ is_source_enabled (ESource *source) */ gboolean ask_recurrence_modification_type (GtkWidget *parent, - ECalObjModType *modtype, + GcalRecurrenceModType *modtype, ESource *source) { GtkWidget *dialog; @@ -1179,7 +1179,7 @@ ask_recurrence_modification_type (GtkWidget *parent, EClient *client; flags = GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT; - *modtype = E_CAL_OBJ_MOD_THIS; + *modtype = GCAL_RECURRENCE_MOD_THIS_ONLY; dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (parent)), flags, @@ -1211,15 +1211,15 @@ ask_recurrence_modification_type (GtkWidget *parent, is_set = FALSE; break; case GTK_RESPONSE_ACCEPT: - *modtype = E_CAL_OBJ_MOD_THIS; + *modtype = GCAL_RECURRENCE_MOD_THIS_ONLY; is_set = TRUE; break; case GTK_RESPONSE_OK: - *modtype = E_CAL_OBJ_MOD_THIS_AND_FUTURE; + *modtype = GCAL_RECURRENCE_MOD_THIS_AND_FUTURE; is_set = TRUE; break; case GTK_RESPONSE_YES: - *modtype = E_CAL_OBJ_MOD_ALL; + *modtype = GCAL_RECURRENCE_MOD_ALL; is_set = TRUE; break; default: diff --git a/src/gcal-utils.h b/src/gcal-utils.h index 0e846d9b..3be75771 100644 --- a/src/gcal-utils.h +++ b/src/gcal-utils.h @@ -152,7 +152,7 @@ gboolean should_change_date_for_scroll (gdouble gboolean is_source_enabled (ESource *source); gboolean ask_recurrence_modification_type (GtkWidget *parent, - ECalObjModType *modtype, + GcalRecurrenceModType *modtype, ESource *source); gboolean is_workday (guint day); diff --git a/src/gcal-window.c b/src/gcal-window.c index 7c94e38a..368cfd48 100644 --- a/src/gcal-window.c +++ b/src/gcal-window.c @@ -149,8 +149,8 @@ struct _GcalWindow NewEventData *event_creation_data; - GcalEvent *event_to_delete; - ECalObjModType event_to_delete_mod; + GcalEvent *event_to_delete; + GcalRecurrenceModType event_to_delete_mod; /* calendar management */ GtkWidget *calendar_popover; @@ -1081,12 +1081,12 @@ edit_dialog_closed (GtkDialog *dialog, gint response, gpointer user_data) { + GcalRecurrenceModType mod; GcalWindow *window; GcalEditDialog *edit_dialog; GcalEvent *event; GcalView *view; GList *widgets; - ECalObjModType mod; ESource *source; GCAL_ENTRY; @@ -1095,7 +1095,7 @@ edit_dialog_closed (GtkDialog *dialog, edit_dialog = GCAL_EDIT_DIALOG (dialog); event = gcal_edit_dialog_get_event (edit_dialog); view = GCAL_VIEW (window->views[window->active_view]); - mod = E_CAL_OBJ_MOD_THIS; + mod = GCAL_RECURRENCE_MOD_THIS_ONLY; source = gcal_event_get_source (event); if (!gcal_edit_dialog_get_recurrence_changed (edit_dialog) && diff --git a/src/views/gcal-month-view.c b/src/views/gcal-month-view.c index 88d74e66..bb5d0647 100644 --- a/src/views/gcal-month-view.c +++ b/src/views/gcal-month-view.c @@ -774,11 +774,11 @@ gcal_month_view_drag_drop (GtkWidget *widget, guint time) { GcalSubscriberViewPrivate *ppriv = GCAL_SUBSCRIBER_VIEW (widget)->priv; + GcalRecurrenceModType mod; GcalMonthView *self = GCAL_MONTH_VIEW (widget); GtkWidget *event_widget; GDateTime *start_dt, *end_dt, *current_dt; GcalEvent *event; - ECalObjModType mod; ESource *source; gint cell, diff; gint start_month, current_month; @@ -787,7 +787,7 @@ gcal_month_view_drag_drop (GtkWidget *widget, cell = get_dnd_cell (widget, x, y); event_widget = gtk_drag_get_source_widget (context); - mod = E_CAL_OBJ_MOD_THIS; + mod = GCAL_RECURRENCE_MOD_THIS_ONLY; if (!GCAL_IS_EVENT_WIDGET (event_widget)) return FALSE; diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c index 28d6d5d2..e33c8c71 100644 --- a/src/views/gcal-week-grid.c +++ b/src/views/gcal-week-grid.c @@ -980,12 +980,12 @@ gcal_week_grid_drag_drop (GtkWidget *widget, gint y, guint time) { + GcalRecurrenceModType mod; GcalWeekGrid *self; g_autoptr (GDateTime) week_start; g_autoptr (GDateTime) dnd_date; g_autoptr (GDateTime) new_end; GtkWidget *event_widget; - ECalObjModType mod; GcalEvent *event; ESource *source; GTimeSpan timespan = 0; @@ -997,7 +997,7 @@ gcal_week_grid_drag_drop (GtkWidget *widget, drop_cell = get_dnd_cell (widget, x, y); event_widget = gtk_drag_get_source_widget (context); - mod = E_CAL_OBJ_MOD_THIS; + mod = GCAL_RECURRENCE_MOD_THIS_ONLY; week_start = NULL; dnd_date = NULL; new_end = NULL; diff --git a/src/views/gcal-week-header.c b/src/views/gcal-week-header.c index b0fbf90b..b59f5541 100644 --- a/src/views/gcal-week-header.c +++ b/src/views/gcal-week-header.c @@ -1407,7 +1407,7 @@ gcal_week_header_drag_drop (GtkWidget *widget, gcal_event_set_all_day (event, TRUE); /* Commit the changes */ - gcal_manager_update_event (self->manager, event, E_CAL_OBJ_MOD_THIS); + gcal_manager_update_event (self->manager, event, GCAL_RECURRENCE_MOD_THIS_ONLY); /* Cancel the DnD */ self->dnd_cell = -1; diff --git a/src/views/gcal-year-view.c b/src/views/gcal-year-view.c index 164ff0f1..4780af8b 100644 --- a/src/views/gcal-year-view.c +++ b/src/views/gcal-year-view.c @@ -1488,8 +1488,8 @@ navigator_drag_drop_cb (GcalYearView *self, if (!is_title) { + GcalRecurrenceModType mod; GcalEventWidget *event_widget; - ECalObjModType mod; GcalEvent *event; GDateTime *start_dt, *end_dt; GDateTime *drop_date; @@ -1498,7 +1498,7 @@ navigator_drag_drop_cb (GcalYearView *self, event_widget = GCAL_EVENT_WIDGET (gtk_drag_get_source_widget (context)); event = gcal_event_widget_get_event (event_widget); source = gcal_event_get_source (event); - mod = E_CAL_OBJ_MOD_THIS; + mod = GCAL_RECURRENCE_MOD_THIS_ONLY; if (gcal_event_has_recurrence (event) && !ask_recurrence_modification_type (GTK_WIDGET (self), &mod, source))