Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

recurrence: add GcalRecurrenceModType

Browse Source 
Instead of reusing the ECalObjModType and mixing the
prefixes all around, do this small cleanup and add a
gcal-prefixed enum.
This commit is contained in:
Georges Basile Stavracas Neto
2017-09-07 00:02:40 -03:00
parent edce0ab076
commit 3b6b536663
11 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-edit-dialog.c
+1 -1
View File
@@ -914,7 +914,7 @@ remove_button_clicked (GtkButton *button,
gcal_event_remove_alarm (event, trigger_minutes); 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); gtk_widget_destroy (row);
src/gcal-manager.c
+12 -12
View File
@@ -1750,14 +1750,14 @@ gcal_manager_create_event (GcalManager *manager,
* gcal_manager_update_event: * gcal_manager_update_event:
* @manager: a #GcalManager * @manager: a #GcalManager
* @event: a #GcalEvent * @event: a #GcalEvent
* @mod: an #ECalObjModType * @mod: an #GcalRecurrenceModType
* *
* Saves all changes made to @event persistently. * Saves all changes made to @event persistently.
*/ */
void void
gcal_manager_update_event (GcalManager *manager, gcal_manager_update_event (GcalManager *manager,
GcalEvent *event, GcalEvent *event,
ECalObjModType mod) GcalRecurrenceModType mod)
{ {
GcalManagerUnit *unit; GcalManagerUnit *unit;
ECalComponent *component; ECalComponent *component;
@@ -1776,7 +1776,7 @@ gcal_manager_update_event (GcalManager *manager,
* the rid to NULL when modifying a recurrent event with MOD_ALL * the rid to NULL when modifying a recurrent event with MOD_ALL
* modtype. * modtype.
*/ */
if (mod == E_CAL_OBJ_MOD_ALL) if (mod == GCAL_RECURRENCE_MOD_ALL)
e_cal_component_set_recurid (component, NULL); 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_client_modify_object (unit->client,
e_cal_component_get_icalcomponent (component), e_cal_component_get_icalcomponent (component),
mod, (ECalObjModType) mod,
NULL, NULL,
on_event_updated, on_event_updated,
component); component);
@@ -1800,14 +1800,14 @@ gcal_manager_update_event (GcalManager *manager,
* gcal_manager_remove_event: * gcal_manager_remove_event:
* @manager: a #GcalManager * @manager: a #GcalManager
* @event: a #GcalEvent * @event: a #GcalEvent
* @mod: an #ECalObjModType * @mod: an #GcalRecurrenceModType
* *
* Deletes @event. * Deletes @event.
*/ */
void void
gcal_manager_remove_event (GcalManager *manager, gcal_manager_remove_event (GcalManager *manager,
GcalEvent *event, GcalEvent *event,
ECalObjModType mod) GcalRecurrenceModType mod)
{ {
GcalManagerUnit *unit; GcalManagerUnit *unit;
ECalComponent *component; ECalComponent *component;
@@ -1837,8 +1837,8 @@ gcal_manager_remove_event (GcalManager *manager,
e_cal_client_remove_object (unit->client, e_cal_client_remove_object (unit->client,
uid, uid,
mod == E_CAL_OBJ_MOD_ALL ? NULL : rid, mod == GCAL_RECURRENCE_MOD_ALL ? NULL : rid,
mod, (ECalObjModType) mod,
manager->async_ops, manager->async_ops,
on_event_removed, on_event_removed,
component); component);
src/gcal-manager.h
+6 -6
View File
@@ -74,13 +74,13 @@ gboolean gcal_manager_is_client_writable (GcalManager
void gcal_manager_create_event (GcalManager *manager, void gcal_manager_create_event (GcalManager *manager,
GcalEvent *event); GcalEvent *event);
void gcal_manager_update_event (GcalManager *manager, void gcal_manager_update_event (GcalManager *manager,
GcalEvent *event, GcalEvent *event,
ECalObjModType mod); GcalRecurrenceModType mod);
void gcal_manager_remove_event (GcalManager *manager, void gcal_manager_remove_event (GcalManager *manager,
GcalEvent *event, GcalEvent *event,
ECalObjModType mod); GcalRecurrenceModType mod);
void gcal_manager_move_event_to_source (GcalManager *manager, void gcal_manager_move_event_to_source (GcalManager *manager,
GcalEvent *event, GcalEvent *event,
src/gcal-recurrence.h
+7
View File
@@ -47,6 +47,13 @@ typedef enum
GCAL_RECURRENCE_UNTIL GCAL_RECURRENCE_UNTIL
} GcalRecurrenceLimitType; } 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 struct _GcalRecurrence
{ {
gint ref_count; gint ref_count;
src/gcal-utils.c
+5 -5
View File
@@ -1169,7 +1169,7 @@ is_source_enabled (ESource *source)
*/ */
gboolean gboolean
ask_recurrence_modification_type (GtkWidget *parent, ask_recurrence_modification_type (GtkWidget *parent,
ECalObjModType *modtype, GcalRecurrenceModType *modtype,
ESource *source) ESource *source)
{ {
GtkWidget *dialog; GtkWidget *dialog;
@@ -1179,7 +1179,7 @@ ask_recurrence_modification_type (GtkWidget *parent,
EClient *client; EClient *client;
flags = GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT; 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)), dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (parent)),
flags, flags,
@@ -1211,15 +1211,15 @@ ask_recurrence_modification_type (GtkWidget *parent,
is_set = FALSE; is_set = FALSE;
break; break;
case GTK_RESPONSE_ACCEPT: case GTK_RESPONSE_ACCEPT:
*modtype = E_CAL_OBJ_MOD_THIS; *modtype = GCAL_RECURRENCE_MOD_THIS_ONLY;
is_set = TRUE; is_set = TRUE;
break; break;
case GTK_RESPONSE_OK: case GTK_RESPONSE_OK:
*modtype = E_CAL_OBJ_MOD_THIS_AND_FUTURE; *modtype = GCAL_RECURRENCE_MOD_THIS_AND_FUTURE;
is_set = TRUE; is_set = TRUE;
break; break;
case GTK_RESPONSE_YES: case GTK_RESPONSE_YES:
*modtype = E_CAL_OBJ_MOD_ALL; *modtype = GCAL_RECURRENCE_MOD_ALL;
is_set = TRUE; is_set = TRUE;
break; break;
default: default:
src/gcal-utils.h
+1 -1
View File
@@ -152,7 +152,7 @@ gboolean should_change_date_for_scroll (gdouble
gboolean is_source_enabled (ESource *source); gboolean is_source_enabled (ESource *source);
gboolean ask_recurrence_modification_type (GtkWidget *parent, gboolean ask_recurrence_modification_type (GtkWidget *parent,
ECalObjModType *modtype, GcalRecurrenceModType *modtype,
ESource *source); ESource *source);
gboolean is_workday (guint day); gboolean is_workday (guint day);
src/gcal-window.c
+4 -4
View File
@@ -149,8 +149,8 @@ struct _GcalWindow
NewEventData *event_creation_data; NewEventData *event_creation_data;
GcalEvent *event_to_delete; GcalEvent *event_to_delete;
ECalObjModType event_to_delete_mod; GcalRecurrenceModType event_to_delete_mod;
/* calendar management */ /* calendar management */
GtkWidget *calendar_popover; GtkWidget *calendar_popover;
@@ -1081,12 +1081,12 @@ edit_dialog_closed (GtkDialog *dialog,
gint response, gint response,
gpointer user_data) gpointer user_data)
{ {
GcalRecurrenceModType mod;
GcalWindow *window; GcalWindow *window;
GcalEditDialog *edit_dialog; GcalEditDialog *edit_dialog;
GcalEvent *event; GcalEvent *event;
GcalView *view; GcalView *view;
GList *widgets; GList *widgets;
ECalObjModType mod;
ESource *source; ESource *source;
GCAL_ENTRY; GCAL_ENTRY;
@@ -1095,7 +1095,7 @@ edit_dialog_closed (GtkDialog *dialog,
edit_dialog = GCAL_EDIT_DIALOG (dialog); edit_dialog = GCAL_EDIT_DIALOG (dialog);
event = gcal_edit_dialog_get_event (edit_dialog); event = gcal_edit_dialog_get_event (edit_dialog);
view = GCAL_VIEW (window->views[window->active_view]); 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); source = gcal_event_get_source (event);
if (!gcal_edit_dialog_get_recurrence_changed (edit_dialog) && if (!gcal_edit_dialog_get_recurrence_changed (edit_dialog) &&
src/views/gcal-month-view.c
+2 -2
View File
@@ -774,11 +774,11 @@ gcal_month_view_drag_drop (GtkWidget *widget,
guint time) guint time)
{ {
GcalSubscriberViewPrivate *ppriv = GCAL_SUBSCRIBER_VIEW (widget)->priv; GcalSubscriberViewPrivate *ppriv = GCAL_SUBSCRIBER_VIEW (widget)->priv;
GcalRecurrenceModType mod;
GcalMonthView *self = GCAL_MONTH_VIEW (widget); GcalMonthView *self = GCAL_MONTH_VIEW (widget);
GtkWidget *event_widget; GtkWidget *event_widget;
GDateTime *start_dt, *end_dt, *current_dt; GDateTime *start_dt, *end_dt, *current_dt;
GcalEvent *event; GcalEvent *event;
ECalObjModType mod;
ESource *source; ESource *source;
gint cell, diff; gint cell, diff;
gint start_month, current_month; gint start_month, current_month;
@@ -787,7 +787,7 @@ gcal_month_view_drag_drop (GtkWidget *widget,
cell = get_dnd_cell (widget, x, y); cell = get_dnd_cell (widget, x, y);
event_widget = gtk_drag_get_source_widget (context); 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)) if (!GCAL_IS_EVENT_WIDGET (event_widget))
return FALSE; return FALSE;
src/views/gcal-week-grid.c
+2 -2
View File
@@ -980,12 +980,12 @@ gcal_week_grid_drag_drop (GtkWidget *widget,
gint y, gint y,
guint time) guint time)
{ {
GcalRecurrenceModType mod;
GcalWeekGrid *self; GcalWeekGrid *self;
g_autoptr (GDateTime) week_start; g_autoptr (GDateTime) week_start;
g_autoptr (GDateTime) dnd_date; g_autoptr (GDateTime) dnd_date;
g_autoptr (GDateTime) new_end; g_autoptr (GDateTime) new_end;
GtkWidget *event_widget; GtkWidget *event_widget;
ECalObjModType mod;
GcalEvent *event; GcalEvent *event;
ESource *source; ESource *source;
GTimeSpan timespan = 0; GTimeSpan timespan = 0;
@@ -997,7 +997,7 @@ gcal_week_grid_drag_drop (GtkWidget *widget,
drop_cell = get_dnd_cell (widget, x, y); drop_cell = get_dnd_cell (widget, x, y);
event_widget = gtk_drag_get_source_widget (context); event_widget = gtk_drag_get_source_widget (context);
mod = E_CAL_OBJ_MOD_THIS; mod = GCAL_RECURRENCE_MOD_THIS_ONLY;
week_start = NULL; week_start = NULL;
dnd_date = NULL; dnd_date = NULL;
new_end = NULL; new_end = NULL;
src/views/gcal-week-header.c
+1 -1
View File
@@ -1407,7 +1407,7 @@ gcal_week_header_drag_drop (GtkWidget *widget,
gcal_event_set_all_day (event, TRUE); gcal_event_set_all_day (event, TRUE);
/* Commit the changes */ /* 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 */ /* Cancel the DnD */
self->dnd_cell = -1; self->dnd_cell = -1;
src/views/gcal-year-view.c
+2 -2
View File
@@ -1488,8 +1488,8 @@ navigator_drag_drop_cb (GcalYearView *self,
if (!is_title) if (!is_title)
{ {
GcalRecurrenceModType mod;
GcalEventWidget *event_widget; GcalEventWidget *event_widget;
ECalObjModType mod;
GcalEvent *event; GcalEvent *event;
GDateTime *start_dt, *end_dt; GDateTime *start_dt, *end_dt;
GDateTime *drop_date; 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_widget = GCAL_EVENT_WIDGET (gtk_drag_get_source_widget (context));
event = gcal_event_widget_get_event (event_widget); event = gcal_event_widget_get_event (event_widget);
source = gcal_event_get_source (event); source = gcal_event_get_source (event);
mod = E_CAL_OBJ_MOD_THIS; mod = GCAL_RECURRENCE_MOD_THIS_ONLY;
if (gcal_event_has_recurrence (event) && if (gcal_event_has_recurrence (event) &&
!ask_recurrence_modification_type (GTK_WIDGET (self), &mod, source)) !ask_recurrence_modification_type (GTK_WIDGET (self), &mod, source))