M!53 - calendar: Mention ECalOperationFlags directly instead of using guint32tintou/ECalOperationFlags

Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/53

14 files changed, 112 insertions, 112 deletions

diff --git a/src/calendar/backends/caldav/e-cal-backend-caldav.c b/src/calendar/backends/caldav/e-cal-backend-caldav.c
index e50bc0b57..0a1edca45 100644
--- a/src/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/src/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -1410,7 +1410,7 @@ ecb_caldav_save_component_sync (ECalMetaBackend *meta_backend,
 				EConflictResolution conflict_resolution,
 				const GSList *instances,
 				const gchar *extra,
-				guint32 opflags,
+				ECalOperationFlags opflags,
 				gchar **out_new_uid,
 				gchar **out_new_extra,
 				GCancellable *cancellable,
@@ -1543,7 +1543,7 @@ ecb_caldav_remove_component_sync (ECalMetaBackend *meta_backend,
 				  const gchar *uid,
 				  const gchar *extra,
 				  const gchar *object,
-				  guint32 opflags,
+				  ECalOperationFlags opflags,
 				  GCancellable *cancellable,
 				  GError **error)
 {
diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
index 54552d939..e69686177 100644
--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -1157,7 +1157,7 @@ e_cal_backend_contacts_receive_objects (ECalBackendSync *backend,
                                         EDataCal *cal,
                                         GCancellable *cancellable,
                                         const gchar *calobj,
-					guint32 opflags,
+					ECalOperationFlags opflags,
                                         GError **perror)
 {
 	g_propagate_error (perror, EC_ERROR (E_CLIENT_ERROR_PERMISSION_DENIED));
@@ -1168,7 +1168,7 @@ e_cal_backend_contacts_send_objects (ECalBackendSync *backend,
                                      EDataCal *cal,
                                      GCancellable *cancellable,
                                      const gchar *calobj,
-				     guint32 opflags,
+				     ECalOperationFlags opflags,
                                      GSList **users,
                                      gchar **modified_calobj,
                                      GError **perror)
@@ -1404,7 +1404,7 @@ e_cal_backend_contacts_create_objects (ECalBackendSync *backend,
                                        EDataCal *cal,
                                        GCancellable *cancellable,
                                        const GSList *calobjs,
-				       guint32 opflags,
+				       ECalOperationFlags opflags,
                                        GSList **uids,
                                        GSList **new_components,
                                        GError **perror)
diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
index d05bbf9f2..7b248aaeb 100644
--- a/src/calendar/backends/file/e-cal-backend-file.c
+++ b/src/calendar/backends/file/e-cal-backend-file.c
@@ -2296,7 +2296,7 @@ e_cal_backend_file_create_objects (ECalBackendSync *backend,
                                    EDataCal *cal,
                                    GCancellable *cancellable,
                                    const GSList *in_calobjs,
-				   guint32 opflags,
+				   ECalOperationFlags opflags,
                                    GSList **uids,
                                    GSList **new_components,
                                    GError **error)
@@ -2476,7 +2476,7 @@ e_cal_backend_file_modify_objects (ECalBackendSync *backend,
                                    GCancellable *cancellable,
                                    const GSList *calobjs,
                                    ECalObjModType mod,
-				   guint32 opflags,
+				   ECalOperationFlags opflags,
                                    GSList **old_components,
                                    GSList **new_components,
                                    GError **error)
@@ -3070,7 +3070,7 @@ e_cal_backend_file_remove_objects (ECalBackendSync *backend,
                                    GCancellable *cancellable,
                                    const GSList *ids,
                                    ECalObjModType mod,
-				   guint32 opflags,
+				   ECalOperationFlags opflags,
                                    GSList **old_components,
                                    GSList **new_components,
                                    GError **error)
@@ -3397,7 +3397,7 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
                                     EDataCal *cal,
                                     GCancellable *cancellable,
                                     const gchar *calobj,
-				    guint32 opflags,
+				    ECalOperationFlags opflags,
                                     GError **error)
 {
 	ESourceRegistry *registry;
@@ -3708,7 +3708,7 @@ e_cal_backend_file_send_objects (ECalBackendSync *backend,
                                  EDataCal *cal,
                                  GCancellable *cancellable,
                                  const gchar *calobj,
-				 guint32 opflags,
+				 ECalOperationFlags opflags,
                                  GSList **users,
                                  gchar **modified_calobj,
                                  GError **perror)
diff --git a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
index cb48f8bae..d4ab00459 100644
--- a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
+++ b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
@@ -867,7 +867,7 @@ ecb_gtasks_save_component_sync (ECalMetaBackend *meta_backend,
 				EConflictResolution conflict_resolution,
 				const GSList *instances, /* ECalComponent * */
 				const gchar *extra,
-				guint32 opflags,
+				ECalOperationFlags opflags,
 				gchar **out_new_uid,
 				gchar **out_new_extra,
 				GCancellable *cancellable,
@@ -962,7 +962,7 @@ ecb_gtasks_remove_component_sync (ECalMetaBackend *meta_backend,
 				  const gchar *uid,
 				  const gchar *extra,
 				  const gchar *object,
-				  guint32 opflags,
+				  ECalOperationFlags opflags,
 				  GCancellable *cancellable,
 				  GError **error)
 {
diff --git a/src/calendar/backends/weather/e-cal-backend-weather.c b/src/calendar/backends/weather/e-cal-backend-weather.c
index 0470e3f4c..19eb5cd38 100644
--- a/src/calendar/backends/weather/e-cal-backend-weather.c
+++ b/src/calendar/backends/weather/e-cal-backend-weather.c
@@ -727,7 +727,7 @@ e_cal_backend_weather_receive_objects (ECalBackendSync *backend,
                                        EDataCal *cal,
                                        GCancellable *cancellable,
                                        const gchar *calobj,
-				       guint32 opflags,
+				       ECalOperationFlags opflags,
                                        GError **perror)
 {
 	g_propagate_error (perror, EC_ERROR (E_CLIENT_ERROR_PERMISSION_DENIED));
diff --git a/src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c b/src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c
index b397fadac..2d27b08b4 100644
--- a/src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c
+++ b/src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c
@@ -1010,7 +1010,7 @@ ecb_webdav_notes_save_component_sync (ECalMetaBackend *meta_backend,
 				      EConflictResolution conflict_resolution,
 				      const GSList *instances,
 				      const gchar *extra,
-				      guint32 opflags,
+				      ECalOperationFlags opflags,
 				      gchar **out_new_uid,
 				      gchar **out_new_extra,
 				      GCancellable *cancellable,
@@ -1191,7 +1191,7 @@ ecb_webdav_notes_remove_component_sync (ECalMetaBackend *meta_backend,
 					const gchar *uid,
 					const gchar *extra,
 					const gchar *object,
-					guint32 opflags,
+					ECalOperationFlags opflags,
 					GCancellable *cancellable,
 					GError **error)
 {
diff --git a/src/calendar/libecal/e-cal-client.h b/src/calendar/libecal/e-cal-client.h
index d6498f322..81ebd271a 100644
--- a/src/calendar/libecal/e-cal-client.h
+++ b/src/calendar/libecal/e-cal-client.h
@@ -333,7 +333,7 @@ gboolean	e_cal_client_get_free_busy_sync	(ECalClient *client,
 						 GError **error);
 void		e_cal_client_create_object	(ECalClient *client,
 						 ICalComponent *icalcomp,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -344,13 +344,13 @@ gboolean	e_cal_client_create_object_finish
 						 GError **error);
 gboolean	e_cal_client_create_object_sync	(ECalClient *client,
 						 ICalComponent *icalcomp,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 gchar **out_uid,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_client_create_objects	(ECalClient *client,
 						 GSList *icalcomps, /* ICalComponent * */
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -362,14 +362,14 @@ gboolean	e_cal_client_create_objects_finish
 gboolean	e_cal_client_create_objects_sync
 						(ECalClient *client,
 						 GSList *icalcomps, /* ICalComponent * */
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **out_uids, /* gchar * */
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_client_modify_object	(ECalClient *client,
 						 ICalComponent *icalcomp,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -380,13 +380,13 @@ gboolean	e_cal_client_modify_object_finish
 gboolean	e_cal_client_modify_object_sync	(ECalClient *client,
 						 ICalComponent *icalcomp,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_client_modify_objects	(ECalClient *client,
 						 GSList *icalcomps, /* ICalComponent * */
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -398,14 +398,14 @@ gboolean	e_cal_client_modify_objects_sync
 						(ECalClient *client,
 						 GSList *icalcomps, /* ICalComponent * */
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_client_remove_object	(ECalClient *client,
 						 const gchar *uid,
 						 const gchar *rid,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -417,13 +417,13 @@ gboolean	e_cal_client_remove_object_sync	(ECalClient *client,
 						 const gchar *uid,
 						 const gchar *rid,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_client_remove_objects	(ECalClient *client,
 						 const GSList *ids, /* ECalComponentId * */
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -435,12 +435,12 @@ gboolean	e_cal_client_remove_objects_sync
 						(ECalClient *client,
 						 const GSList *ids, /* ECalComponentId * */
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_client_receive_objects	(ECalClient *client,
 						 ICalComponent *icalcomp,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -451,12 +451,12 @@ gboolean	e_cal_client_receive_objects_finish
 gboolean	e_cal_client_receive_objects_sync
 						(ECalClient *client,
 						 ICalComponent *icalcomp,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_client_send_objects	(ECalClient *client,
 						 ICalComponent *icalcomp,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -468,7 +468,7 @@ gboolean	e_cal_client_send_objects_finish
 						 GError **error);
 gboolean	e_cal_client_send_objects_sync	(ECalClient *client,
 						 ICalComponent *icalcomp,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **out_users, /* gchar * */
 						 ICalComponent **out_modified_icalcomp,
 						 GCancellable *cancellable,
@@ -496,7 +496,7 @@ void		e_cal_client_discard_alarm	(ECalClient *client,
 						 const gchar *uid,
 						 const gchar *rid,
 						 const gchar *auid,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -508,7 +508,7 @@ gboolean	e_cal_client_discard_alarm_sync	(ECalClient *client,
 						 const gchar *uid,
 						 const gchar *rid,
 						 const gchar *auid,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_client_get_view		(ECalClient *client,
diff --git a/src/calendar/libedata-cal/e-cal-backend-sync.c b/src/calendar/libedata-cal/e-cal-backend-sync.c
index 05d2846a9..ec9b49f88 100644
--- a/src/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/src/calendar/libedata-cal/e-cal-backend-sync.c
@@ -248,7 +248,7 @@ e_cal_backend_sync_create_objects (ECalBackendSync *backend,
                                    EDataCal *cal,
                                    GCancellable *cancellable,
                                    const GSList *calobjs,
-				   guint32 opflags,
+				   ECalOperationFlags opflags,
                                    GSList **uids,
                                    GSList **new_components,
                                    GError **error)
@@ -297,7 +297,7 @@ e_cal_backend_sync_modify_objects (ECalBackendSync *backend,
                                    GCancellable *cancellable,
                                    const GSList *calobjs,
                                    ECalObjModType mod,
-				   guint32 opflags,
+				   ECalOperationFlags opflags,
                                    GSList **old_components,
                                    GSList **new_components,
                                    GError **error)
@@ -347,7 +347,7 @@ e_cal_backend_sync_remove_objects (ECalBackendSync *backend,
                                    GCancellable *cancellable,
                                    const GSList *ids,
                                    ECalObjModType mod,
-				   guint32 opflags,
+				   ECalOperationFlags opflags,
                                    GSList **old_components,
                                    GSList **new_components,
                                    GError **error)
@@ -388,7 +388,7 @@ e_cal_backend_sync_receive_objects (ECalBackendSync *backend,
                                     EDataCal *cal,
                                     GCancellable *cancellable,
                                     const gchar *calobj,
-				    guint32 opflags,
+				    ECalOperationFlags opflags,
                                     GError **error)
 {
 	ECalBackendSyncClass *class;
@@ -428,7 +428,7 @@ e_cal_backend_sync_send_objects (ECalBackendSync *backend,
                                  EDataCal *cal,
                                  GCancellable *cancellable,
                                  const gchar *calobj,
-				 guint32 opflags,
+				 ECalOperationFlags opflags,
                                  GSList **users,
                                  gchar **modified_calobj,
                                  GError **error)
@@ -517,7 +517,7 @@ e_cal_backend_sync_discard_alarm (ECalBackendSync *backend,
                                   const gchar *uid,
                                   const gchar *rid,
                                   const gchar *auid,
-				  guint32 opflags,
+				  ECalOperationFlags opflags,
                                   GError **error)
 {
 	ECalBackendSyncClass *class;
@@ -745,7 +745,7 @@ cal_backend_create_objects (ECalBackend *backend,
                             guint32 opid,
                             GCancellable *cancellable,
                             const GSList *calobjs,
-			    guint32 opflags)
+			    ECalOperationFlags opflags)
 {
 	GError *error = NULL;
 	GSList *uids = NULL;
@@ -769,7 +769,7 @@ cal_backend_modify_objects (ECalBackend *backend,
                             GCancellable *cancellable,
                             const GSList *calobjs,
                             ECalObjModType mod,
-			    guint32 opflags)
+			    ECalOperationFlags opflags)
 {
 	GError *error = NULL;
 	GSList *old_components = NULL, *new_components = NULL;
@@ -792,7 +792,7 @@ cal_backend_remove_objects (ECalBackend *backend,
                             GCancellable *cancellable,
                             const GSList *ids,
                             ECalObjModType mod,
-			    guint32 opflags)
+			    ECalOperationFlags opflags)
 {
 	GError *error = NULL;
 	GSList *old_components = NULL, *new_components = NULL;
@@ -811,7 +811,7 @@ cal_backend_receive_objects (ECalBackend *backend,
                              guint32 opid,
                              GCancellable *cancellable,
                              const gchar *calobj,
-			     guint32 opflags)
+			     ECalOperationFlags opflags)
 {
 	GError *error = NULL;
 
@@ -826,7 +826,7 @@ cal_backend_send_objects (ECalBackend *backend,
                           guint32 opid,
                           GCancellable *cancellable,
                           const gchar *calobj,
-			  guint32 opflags)
+			  ECalOperationFlags opflags)
 {
 	GError *error = NULL;
 	GSList *users = NULL;
@@ -868,7 +868,7 @@ cal_backend_discard_alarm (ECalBackend *backend,
                            const gchar *uid,
                            const gchar *rid,
                            const gchar *auid,
-			   guint32 opflags)
+			   ECalOperationFlags opflags)
 {
 	GError *error = NULL;
 
diff --git a/src/calendar/libedata-cal/e-cal-backend-sync.h b/src/calendar/libedata-cal/e-cal-backend-sync.h
index 90d472a7e..3b4a42122 100644
--- a/src/calendar/libedata-cal/e-cal-backend-sync.h
+++ b/src/calendar/libedata-cal/e-cal-backend-sync.h
@@ -121,7 +121,7 @@ struct _ECalBackendSyncClass {
 						 EDataCal *cal,
 						 GCancellable *cancellable,
 						 const GSList *calobjs,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **uids,
 						 GSList **new_components,
 						 GError **error);
@@ -130,7 +130,7 @@ struct _ECalBackendSyncClass {
 						 GCancellable *cancellable,
 						 const GSList *calobjs,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **old_components,
 						 GSList **new_components,
 						 GError **error);
@@ -139,7 +139,7 @@ struct _ECalBackendSyncClass {
 						 GCancellable *cancellable,
 						 const GSList *ids,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **old_components,
 						 GSList **new_components,
 						 GError **error);
@@ -147,13 +147,13 @@ struct _ECalBackendSyncClass {
 						 EDataCal *cal,
 						 GCancellable *cancellable,
 						 const gchar *calobj,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GError **error);
 	void		(*send_objects_sync)	(ECalBackendSync *backend,
 						 EDataCal *cal,
 						 GCancellable *cancellable,
 						 const gchar *calobj,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **users,
 						 gchar **modified_calobj,
 						 GError **error);
@@ -171,7 +171,7 @@ struct _ECalBackendSyncClass {
 						 const gchar *uid,
 						 const gchar *rid,
 						 const gchar *auid,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GError **error);
 	void		(*get_timezone_sync)	(ECalBackendSync *backend,
 						 EDataCal *cal,
@@ -226,7 +226,7 @@ void		e_cal_backend_sync_create_objects
 						 EDataCal *cal,
 						 GCancellable *cancellable,
 						 const GSList *calobjs,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **uids,
 						 GSList **new_components,
 						 GError **error);
@@ -236,7 +236,7 @@ void		e_cal_backend_sync_modify_objects
 						 GCancellable *cancellable,
 						 const GSList *calobjs,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **old_components,
 						 GSList **new_components,
 						 GError **error);
@@ -246,7 +246,7 @@ void		e_cal_backend_sync_remove_objects
 						 GCancellable *cancellable,
 						 const GSList *ids,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **old_components,
 						 GSList **new_components,
 						 GError **error);
@@ -255,13 +255,13 @@ void		e_cal_backend_sync_receive_objects
 						 EDataCal *cal,
 						 GCancellable *cancellable,
 						 const gchar *calobj,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GError **error);
 void		e_cal_backend_sync_send_objects	(ECalBackendSync *backend,
 						 EDataCal *cal,
 						 GCancellable *cancellable,
 						 const gchar *calobj,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GSList **users,
 						 gchar **modified_calobj,
 						 GError **error);
@@ -280,7 +280,7 @@ void		e_cal_backend_sync_discard_alarm
 						 const gchar *uid,
 						 const gchar *rid,
 						 const gchar *auid,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GError **error);
 void		e_cal_backend_sync_get_timezone	(ECalBackendSync *backend,
 						 EDataCal *cal,
diff --git a/src/calendar/libedata-cal/e-cal-backend.c b/src/calendar/libedata-cal/e-cal-backend.c
index 6c4482970..ac9f8e9d2 100644
--- a/src/calendar/libedata-cal/e-cal-backend.c
+++ b/src/calendar/libedata-cal/e-cal-backend.c
@@ -80,7 +80,7 @@ struct _AsyncContext {
 	time_t end;
 	GSList *compid_list;
 	GSList *string_list;
-	guint32 opflags;
+	ECalOperationFlags opflags;
 
 	/* Outputs */
 	GQueue result_queue;
@@ -2590,7 +2590,7 @@ e_cal_backend_get_free_busy_finish (ECalBackend *backend,
 gboolean
 e_cal_backend_create_objects_sync (ECalBackend *backend,
                                    const gchar * const *calobjs,
-				   guint32 opflags,
+                                   ECalOperationFlags opflags,
                                    GQueue *out_uids,
                                    GCancellable *cancellable,
                                    GError **error)
@@ -2688,7 +2688,7 @@ cal_backend_create_objects_thread (GSimpleAsyncResult *simple,
 void
 e_cal_backend_create_objects (ECalBackend *backend,
                               const gchar * const *calobjs,
-			      guint32 opflags,
+                              ECalOperationFlags opflags,
                               GCancellable *cancellable,
                               GAsyncReadyCallback callback,
                               gpointer user_data)
@@ -2818,7 +2818,7 @@ gboolean
 e_cal_backend_modify_objects_sync (ECalBackend *backend,
                                    const gchar * const *calobjs,
                                    ECalObjModType mod,
-				   guint32 opflags,
+                                   ECalOperationFlags opflags,
                                    GCancellable *cancellable,
                                    GError **error)
 {
@@ -2920,7 +2920,7 @@ void
 e_cal_backend_modify_objects (ECalBackend *backend,
                               const gchar * const *calobjs,
                               ECalObjModType mod,
-			      guint32 opflags,
+                              ECalOperationFlags opflags,
                               GCancellable *cancellable,
                               GAsyncReadyCallback callback,
                               gpointer user_data)
@@ -3057,7 +3057,7 @@ gboolean
 e_cal_backend_remove_objects_sync (ECalBackend *backend,
                                    GList *component_ids,
                                    ECalObjModType mod,
-				   guint32 opflags,
+                                   ECalOperationFlags opflags,
                                    GCancellable *cancellable,
                                    GError **error)
 {
@@ -3152,7 +3152,7 @@ void
 e_cal_backend_remove_objects (ECalBackend *backend,
                               GList *component_ids,
                               ECalObjModType mod,
-			      guint32 opflags,
+                              ECalOperationFlags opflags,
                               GCancellable *cancellable,
                               GAsyncReadyCallback callback,
                               gpointer user_data)
@@ -3302,7 +3302,7 @@ e_cal_backend_remove_objects_finish (ECalBackend *backend,
 gboolean
 e_cal_backend_receive_objects_sync (ECalBackend *backend,
                                     const gchar *calobj,
-				    guint32 opflags,
+                                    ECalOperationFlags opflags,
                                     GCancellable *cancellable,
                                     GError **error)
 {
@@ -3395,7 +3395,7 @@ cal_backend_receive_objects_thread (GSimpleAsyncResult *simple,
 void
 e_cal_backend_receive_objects (ECalBackend *backend,
                                const gchar *calobj,
-			       guint32 opflags,
+                               ECalOperationFlags opflags,
                                GCancellable *cancellable,
                                GAsyncReadyCallback callback,
                                gpointer user_data)
@@ -3487,7 +3487,7 @@ e_cal_backend_receive_objects_finish (ECalBackend *backend,
 gchar *
 e_cal_backend_send_objects_sync (ECalBackend *backend,
                                  const gchar *calobj,
-				 guint32 opflags,
+                                 ECalOperationFlags opflags,
                                  GQueue *out_users,
                                  GCancellable *cancellable,
                                  GError **error)
@@ -3579,7 +3579,7 @@ cal_backend_send_objects_thread (GSimpleAsyncResult *simple,
 void
 e_cal_backend_send_objects (ECalBackend *backend,
                             const gchar *calobj,
-			    guint32 opflags,
+                            ECalOperationFlags opflags,
                             GCancellable *cancellable,
                             GAsyncReadyCallback callback,
                             gpointer user_data)
@@ -3887,7 +3887,7 @@ e_cal_backend_discard_alarm_sync (ECalBackend *backend,
                                   const gchar *uid,
                                   const gchar *rid,
                                   const gchar *alarm_uid,
-				  guint32 opflags,
+                                  ECalOperationFlags opflags,
                                   GCancellable *cancellable,
                                   GError **error)
 {
@@ -3994,7 +3994,7 @@ e_cal_backend_discard_alarm (ECalBackend *backend,
                              const gchar *uid,
                              const gchar *rid,
                              const gchar *alarm_uid,
-			     guint32 opflags,
+                             ECalOperationFlags opflags,
                              GCancellable *cancellable,
                              GAsyncReadyCallback callback,
                              gpointer user_data)
diff --git a/src/calendar/libedata-cal/e-cal-backend.h b/src/calendar/libedata-cal/e-cal-backend.h
index 90bd43fd6..5327cd01f 100644
--- a/src/calendar/libedata-cal/e-cal-backend.h
+++ b/src/calendar/libedata-cal/e-cal-backend.h
@@ -143,33 +143,33 @@ struct _ECalBackendClass {
 						 guint32 opid,
 						 GCancellable *cancellable,
 						 const GSList *calobjs, /* gchar * */
-						 guint32 opflags); /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags);
 	void		(*impl_modify_objects)	(ECalBackend *backend,
 						 EDataCal *cal,
 						 guint32 opid,
 						 GCancellable *cancellable,
 						 const GSList *calobjs, /* gchar * */
 						 ECalObjModType mod,
-						 guint32 opflags); /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags);
 	void		(*impl_remove_objects)	(ECalBackend *backend,
 						 EDataCal *cal,
 						 guint32 opid,
 						 GCancellable *cancellable,
 						 const GSList *ids, /* ECalComponentId * */
 						 ECalObjModType mod,
-						 guint32 opflags); /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags);
 	void		(*impl_receive_objects)	(ECalBackend *backend,
 						 EDataCal *cal,
 						 guint32 opid,
 						 GCancellable *cancellable,
 						 const gchar *calobj,
-						 guint32 opflags); /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags);
 	void		(*impl_send_objects)	(ECalBackend *backend,
 						 EDataCal *cal,
 						 guint32 opid,
 						 GCancellable *cancellable,
 						 const gchar *calobj,
-						 guint32 opflags); /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags);
 	void		(*impl_get_attachment_uris)
 						(ECalBackend *backend,
 						 EDataCal *cal,
@@ -184,7 +184,7 @@ struct _ECalBackendClass {
 						 const gchar *uid,
 						 const gchar *rid,
 						 const gchar *auid,
-						 guint32 opflags); /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags);
 	void		(*impl_get_timezone)	(ECalBackend *backend,
 						 EDataCal *cal,
 						 guint32 opid,
@@ -332,13 +332,13 @@ gboolean	e_cal_backend_get_free_busy_finish
 gboolean	e_cal_backend_create_objects_sync
 						(ECalBackend *backend,
 						 const gchar * const *calobjs,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GQueue *out_uids,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_backend_create_objects	(ECalBackend *backend,
 						 const gchar * const *calobjs,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -351,13 +351,13 @@ gboolean	e_cal_backend_modify_objects_sync
 						(ECalBackend *backend,
 						 const gchar * const *calobjs,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_backend_modify_objects	(ECalBackend *backend,
 						 const gchar * const *calobjs,
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -369,13 +369,13 @@ gboolean	e_cal_backend_remove_objects_sync
 						(ECalBackend *backend,
 						 GList *component_ids, /* ECalComponentId * */
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_backend_remove_objects	(ECalBackend *backend,
 						 GList *component_ids, /* ECalComponentId * */
 						 ECalObjModType mod,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -386,12 +386,12 @@ gboolean	e_cal_backend_remove_objects_finish
 gboolean	e_cal_backend_receive_objects_sync
 						(ECalBackend *backend,
 						 const gchar *calobj,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_backend_receive_objects	(ECalBackend *backend,
 						 const gchar *calobj,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -401,13 +401,13 @@ gboolean	e_cal_backend_receive_objects_finish
 						 GError **error);
 gchar *		e_cal_backend_send_objects_sync	(ECalBackend *backend,
 						 const gchar *calobj,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GQueue *out_users,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_backend_send_objects	(ECalBackend *backend,
 						 const gchar *calobj,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
@@ -440,14 +440,14 @@ gboolean	e_cal_backend_discard_alarm_sync
 						 const gchar *uid,
 						 const gchar *rid,
 						 const gchar *alarm_uid,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 void		e_cal_backend_discard_alarm	(ECalBackend *backend,
 						 const gchar *uid,
 						 const gchar *rid,
 						 const gchar *alarm_uid,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GAsyncReadyCallback callback,
 						 gpointer user_data);
diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
index 3ccbb0d30..023a2fbe2 100644
--- a/src/calendar/libedata-cal/e-cal-meta-backend.c
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
@@ -134,7 +134,7 @@ static gboolean ecmb_save_component_wrapper_sync (ECalMetaBackend *meta_backend,
 						  EConflictResolution conflict_resolution,
 						  const GSList *in_instances,
 						  const gchar *extra,
-						  guint32 opflags,
+						  ECalOperationFlags opflags,
 						  const gchar *orig_uid,
 						  gboolean *out_requires_put,
 						  gchar **out_new_uid,
@@ -312,7 +312,7 @@ ecmb_gather_locally_cached_objects_cb (ECalCache *cal_cache,
 				       const gchar *revision,
 				       const gchar *object,
 				       const gchar *extra,
-				       guint32 opflags,
+				       ECalOperationFlags opflags,
 				       EOfflineState offline_state,
 				       gpointer user_data)
 {
@@ -557,7 +557,7 @@ ecmb_upload_local_changes_sync (ECalMetaBackend *meta_backend,
 	for (link = offline_changes; link && success; link = g_slist_next (link)) {
 		ECalCacheOfflineChange *change = link->data;
 		gchar *extra = NULL;
-		guint32 opflags = 0;
+		ECalOperationFlags opflags = 0;
 
 		success = !g_cancellable_set_error_if_cancelled (cancellable, error);
 		if (!success)
@@ -940,7 +940,7 @@ ecmb_put_one_component (ECalMetaBackend *meta_backend,
 			ECacheOfflineFlag offline_flag,
 			ECalComponent *comp,
 			const gchar *extra,
-			guint32 opflags,
+			ECalOperationFlags opflags,
 			GSList **inout_cache_instances,
 			GCancellable *cancellable,
 			GError **error)
@@ -988,7 +988,7 @@ ecmb_put_instances (ECalMetaBackend *meta_backend,
 		    ECacheOfflineFlag offline_flag,
 		    const GSList *new_instances, /* ECalComponent * */
 		    const gchar *extra,
-		    guint32 opflags,
+		    ECalOperationFlags opflags,
 		    GCancellable *cancellable,
 		    GError **error)
 {
@@ -1176,7 +1176,7 @@ ecmb_save_component_wrapper_sync (ECalMetaBackend *meta_backend,
 				  EConflictResolution conflict_resolution,
 				  const GSList *in_instances,
 				  const gchar *extra,
-				  guint32 opflags,
+				  ECalOperationFlags opflags,
 				  const gchar *orig_uid,
 				  gboolean *out_requires_put,
 				  gchar **out_new_uid,
@@ -1609,7 +1609,7 @@ ecmb_create_object_sync (ECalMetaBackend *meta_backend,
 			 ECalCache *cal_cache,
 			 ECacheOfflineFlag *offline_flag,
 			 EConflictResolution conflict_resolution,
-			 guint32 opflags,
+			 ECalOperationFlags opflags,
 			 ECalComponent *comp,
 			 gchar **out_new_uid,
 			 ECalComponent **out_new_comp,
@@ -1720,7 +1720,7 @@ ecmb_create_objects_sync (ECalBackendSync *sync_backend,
 			  EDataCal *cal,
 			  GCancellable *cancellable,
 			  const GSList *calobjs,
-			  guint32 opflags,
+			  ECalOperationFlags opflags,
 			  GSList **out_uids,
 			  GSList **out_new_components,
 			  GError **error)
@@ -1789,7 +1789,7 @@ ecmb_modify_object_sync (ECalMetaBackend *meta_backend,
 			 ECacheOfflineFlag *offline_flag,
 			 EConflictResolution conflict_resolution,
 			 ECalObjModType mod,
-			 guint32 opflags,
+			 ECalOperationFlags opflags,
 			 ECalComponent *comp,
 			 ECalComponent **out_old_comp,
 			 ECalComponent **out_new_comp,
@@ -2025,7 +2025,7 @@ ecmb_modify_objects_sync (ECalBackendSync *sync_backend,
 			  GCancellable *cancellable,
 			  const GSList *calobjs,
 			  ECalObjModType mod,
-			  guint32 opflags,
+			  ECalOperationFlags opflags,
 			  GSList **out_old_components,
 			  GSList **out_new_components,
 			  GError **error)
@@ -2091,7 +2091,7 @@ ecmb_remove_object_sync (ECalMetaBackend *meta_backend,
 			 ECacheOfflineFlag *offline_flag,
 			 EConflictResolution conflict_resolution,
 			 ECalObjModType mod,
-			 guint32 opflags,
+			 ECalOperationFlags opflags,
 			 const gchar *uid,
 			 const gchar *rid,
 			 ECalComponent **out_old_comp,
@@ -2406,7 +2406,7 @@ ecmb_remove_objects_sync (ECalBackendSync *sync_backend,
 			  GCancellable *cancellable,
 			  const GSList *ids,
 			  ECalObjModType mod,
-			  guint32 opflags,
+			  ECalOperationFlags opflags,
 			  GSList **out_old_components,
 			  GSList **out_new_components,
 			  GError **error)
@@ -2466,7 +2466,7 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
 			  EConflictResolution conflict_resolution,
 			  ECalComponent *comp,
 			  ICalPropertyMethod method,
-			  guint32 opflags,
+			  ECalOperationFlags opflags,
 			  GCancellable *cancellable,
 			  GError **error)
 {
@@ -2557,7 +2557,7 @@ ecmb_receive_objects_sync (ECalBackendSync *sync_backend,
 			   EDataCal *cal,
 			   GCancellable *cancellable,
 			   const gchar *calobj,
-			   guint32 opflags,
+			   ECalOperationFlags opflags,
 			   GError **error)
 {
 	ECalMetaBackend *meta_backend;
@@ -2651,7 +2651,7 @@ ecmb_send_objects_sync (ECalBackendSync *sync_backend,
 			EDataCal *cal,
 			GCancellable *cancellable,
 			const gchar *calobj,
-			guint32 opflags,
+			ECalOperationFlags opflags,
 			GSList **out_users,
 			gchar **out_modified_calobj,
 			GError **error)
@@ -2766,7 +2766,7 @@ ecmb_discard_alarm_sync (ECalBackendSync *sync_backend,
 			 const gchar *uid,
 			 const gchar *rid,
 			 const gchar *auid,
-			 guint32 opflags,
+			 ECalOperationFlags opflags,
 			 GError **error)
 {
 	g_return_if_fail (E_IS_CAL_META_BACKEND (sync_backend));
@@ -5099,7 +5099,7 @@ e_cal_meta_backend_save_component_sync (ECalMetaBackend *meta_backend,
 					EConflictResolution conflict_resolution,
 					const GSList *instances,
 					const gchar *extra,
-					guint32 opflags,
+					ECalOperationFlags opflags,
 					gchar **out_new_uid,
 					gchar **out_new_extra,
 					GCancellable *cancellable,
@@ -5183,7 +5183,7 @@ e_cal_meta_backend_remove_component_sync (ECalMetaBackend *meta_backend,
 					  const gchar *uid,
 					  const gchar *extra,
 					  const gchar *object,
-					  guint32 opflags,
+					  ECalOperationFlags opflags,
 					  GCancellable *cancellable,
 					  GError **error)
 {
diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.h b/src/calendar/libedata-cal/e-cal-meta-backend.h
index 3057bf27b..60746d4be 100644
--- a/src/calendar/libedata-cal/e-cal-meta-backend.h
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.h
@@ -136,7 +136,7 @@ struct _ECalMetaBackendClass {
 						 EConflictResolution conflict_resolution,
 						 const GSList *instances, /* ECalComponent * */
 						 const gchar *extra,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 gchar **out_new_uid,
 						 gchar **out_new_extra,
 						 GCancellable *cancellable,
@@ -147,7 +147,7 @@ struct _ECalMetaBackendClass {
 						 const gchar *uid,
 						 const gchar *extra,
 						 const gchar *object,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 	gboolean	(* search_sync)		(ECalMetaBackend *meta_backend,
@@ -282,7 +282,7 @@ gboolean	e_cal_meta_backend_save_component_sync
 						 EConflictResolution conflict_resolution,
 						 const GSList *instances, /* ECalComponent * */
 						 const gchar *extra,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 gchar **out_new_uid,
 						 gchar **out_new_extra,
 						 GCancellable *cancellable,
@@ -293,7 +293,7 @@ gboolean	e_cal_meta_backend_remove_component_sync
 						 const gchar *uid,
 						 const gchar *extra,
 						 const gchar *object,
-						 guint32 opflags, /* bit-or of ECalOperationFlags */
+						 ECalOperationFlags opflags,
 						 GCancellable *cancellable,
 						 GError **error);
 gboolean	e_cal_meta_backend_search_sync	(ECalMetaBackend *meta_backend,
diff --git a/tests/libedata-cal/test-cal-meta-backend.c b/tests/libedata-cal/test-cal-meta-backend.c
index 83dc6e1b2..47fc9a1d7 100644
--- a/tests/libedata-cal/test-cal-meta-backend.c
+++ b/tests/libedata-cal/test-cal-meta-backend.c
@@ -456,7 +456,7 @@ e_cal_meta_backend_test_save_component_sync (ECalMetaBackend *meta_backend,
 					     EConflictResolution conflict_resolution,
 					     const GSList *instances,
 					     const gchar *extra,
-					     guint32 opflags,
+					     ECalOperationFlags opflags,
 					     gchar **out_new_uid,
 					     gchar **out_new_extra,
 					     GCancellable *cancellable,
@@ -576,7 +576,7 @@ e_cal_meta_backend_test_remove_component_sync (ECalMetaBackend *meta_backend,
 					       const gchar *uid,
 					       const gchar *extra,
 					       const gchar *object,
-					       guint32 opflags,
+					       ECalOperationFlags opflags,
 					       GCancellable *cancellable,
 					       GError **error)
 {