[evolution-data-server] I#117 - Fix clang warnings (mostly [-Wenum-conversion])
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] I#117 - Fix clang warnings (mostly [-Wenum-conversion])
- Date: Tue, 21 May 2019 16:18:11 +0000 (UTC)
commit c847345e63ac518c403f3af763b73028b547bad6
Author: Milan Crha <mcrha redhat com>
Date: Tue May 21 18:18:43 2019 +0200
I#117 - Fix clang warnings (mostly [-Wenum-conversion])
Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/117
.../libedata-book/e-book-meta-backend.c | 2 +-
.../backends/caldav/e-cal-backend-caldav-factory.c | 6 +++---
.../backends/caldav/e-cal-backend-caldav.c | 8 ++++----
.../contacts/e-cal-backend-contacts-factory.c | 2 +-
.../backends/contacts/e-cal-backend-contacts.c | 2 +-
.../backends/file/e-cal-backend-file-factory.c | 6 +++---
src/calendar/backends/file/e-cal-backend-file.c | 24 +++++++++++-----------
.../backends/gtasks/e-cal-backend-gtasks-factory.c | 2 +-
.../backends/http/e-cal-backend-http-factory.c | 6 +++---
.../weather/e-cal-backend-weather-factory.c | 2 +-
src/calendar/libecal/e-cal-check-timezones.c | 4 ++--
.../libecal/e-cal-component-alarm-trigger.c | 2 +-
src/calendar/libecal/e-cal-recur.c | 20 +++++++++---------
src/calendar/libecal/e-cal-util.c | 4 ++--
src/calendar/libedata-cal/e-cal-backend-factory.c | 6 +++---
src/calendar/libedata-cal/e-cal-backend.c | 8 ++++----
src/calendar/libedata-cal/e-cal-cache.c | 4 ++--
src/calendar/libedata-cal/e-cal-meta-backend.c | 6 +++---
.../libedata-cal/e-subprocess-cal-factory.c | 2 +-
.../evolution-calendar-factory.c | 2 +-
tests/libedata-cal/test-cal-meta-backend.c | 4 ++--
21 files changed, 61 insertions(+), 61 deletions(-)
---
diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c
b/src/addressbook/libedata-book/e-book-meta-backend.c
index b93f8341b..ff7c9d5b7 100644
--- a/src/addressbook/libedata-book/e-book-meta-backend.c
+++ b/src/addressbook/libedata-book/e-book-meta-backend.c
@@ -1668,7 +1668,7 @@ ebmb_remove_contacts_sync (EBookBackendSync *book_backend,
*out_removed_uids = NULL;
if (!e_book_backend_get_writable (E_BOOK_BACKEND (book_backend))) {
- g_propagate_error (error, e_book_client_error_create (E_CLIENT_ERROR_PERMISSION_DENIED,
NULL));
+ g_propagate_error (error, e_client_error_create (E_CLIENT_ERROR_PERMISSION_DENIED, NULL));
return FALSE;
}
diff --git a/src/calendar/backends/caldav/e-cal-backend-caldav-factory.c
b/src/calendar/backends/caldav/e-cal-backend-caldav-factory.c
index 1b99c8d55..1f8de136f 100644
--- a/src/calendar/backends/caldav/e-cal-backend-caldav-factory.c
+++ b/src/calendar/backends/caldav/e-cal-backend-caldav-factory.c
@@ -69,7 +69,7 @@ e_cal_backend_caldav_events_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VEVENT_COMPONENT;
+ class->component_kind = I_CAL_VEVENT_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_CALDAV;
}
@@ -93,7 +93,7 @@ e_cal_backend_caldav_journal_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VJOURNAL_COMPONENT;
+ class->component_kind = I_CAL_VJOURNAL_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_CALDAV;
}
@@ -117,7 +117,7 @@ e_cal_backend_caldav_todos_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VTODO_COMPONENT;
+ class->component_kind = I_CAL_VTODO_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_CALDAV;
}
diff --git a/src/calendar/backends/caldav/e-cal-backend-caldav.c
b/src/calendar/backends/caldav/e-cal-backend-caldav.c
index ad44150cc..af47a859e 100644
--- a/src/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/src/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -757,13 +757,13 @@ ecb_caldav_get_changes_sync (ECalMetaBackend *meta_backend,
switch (e_cal_backend_get_kind (E_CAL_BACKEND (cbdav))) {
default:
- case ICAL_VEVENT_COMPONENT:
+ case I_CAL_VEVENT_COMPONENT:
e_xml_document_add_attribute (xml, NULL, "name", "VEVENT");
break;
- case ICAL_VJOURNAL_COMPONENT:
+ case I_CAL_VJOURNAL_COMPONENT:
e_xml_document_add_attribute (xml, NULL, "name", "VJOURNAL");
break;
- case ICAL_VTODO_COMPONENT:
+ case I_CAL_VTODO_COMPONENT:
e_xml_document_add_attribute (xml, NULL, "name", "VTODO");
break;
}
@@ -1777,7 +1777,7 @@ ecb_caldav_get_free_busy_from_schedule_outbox_sync (ECalBackendCalDAV *cbdav,
/* put the free/busy request to a VCALENDAR */
icomp = e_cal_util_new_top_level ();
- i_cal_component_set_method (icomp, ICAL_METHOD_REQUEST);
+ i_cal_component_set_method (icomp, I_CAL_METHOD_REQUEST);
i_cal_component_take_component (icomp, i_cal_component_clone (e_cal_component_get_icalcomponent
(comp)));
str = i_cal_component_as_ical_string (icomp);
diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts-factory.c
b/src/calendar/backends/contacts/e-cal-backend-contacts-factory.c
index d75aa97d2..d5633448a 100644
--- a/src/calendar/backends/contacts/e-cal-backend-contacts-factory.c
+++ b/src/calendar/backends/contacts/e-cal-backend-contacts-factory.c
@@ -50,7 +50,7 @@ e_cal_backend_contacts_events_factory_class_init (ECalBackendFactoryClass *class
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VEVENT_COMPONENT;
+ class->component_kind = I_CAL_VEVENT_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_CONTACTS;
}
diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c
b/src/calendar/backends/contacts/e-cal-backend-contacts.c
index 270658405..93ea4e753 100644
--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -1284,7 +1284,7 @@ e_cal_backend_contacts_start_view (ECalBackend *backend,
sexp = e_data_cal_view_get_sexp (query);
if (!sexp) {
- GError *error = ECC_ERROR (E_CLIENT_ERROR_INVALID_QUERY);
+ GError *error = EC_ERROR (E_CLIENT_ERROR_INVALID_QUERY);
e_data_cal_view_notify_complete (query, error);
g_error_free (error);
return;
diff --git a/src/calendar/backends/file/e-cal-backend-file-factory.c
b/src/calendar/backends/file/e-cal-backend-file-factory.c
index ddf0eb07e..dd17cb5ab 100644
--- a/src/calendar/backends/file/e-cal-backend-file-factory.c
+++ b/src/calendar/backends/file/e-cal-backend-file-factory.c
@@ -70,7 +70,7 @@ e_cal_backend_file_events_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VEVENT_COMPONENT;
+ class->component_kind = I_CAL_VEVENT_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_FILE_EVENTS;
}
@@ -94,7 +94,7 @@ e_cal_backend_file_journal_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VJOURNAL_COMPONENT;
+ class->component_kind = I_CAL_VJOURNAL_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_FILE_JOURNAL;
}
@@ -118,7 +118,7 @@ e_cal_backend_file_todos_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VTODO_COMPONENT;
+ class->component_kind = I_CAL_VTODO_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_FILE_TODOS;
}
diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
index 1b8feacc0..63706095f 100644
--- a/src/calendar/backends/file/e-cal-backend-file.c
+++ b/src/calendar/backends/file/e-cal-backend-file.c
@@ -483,13 +483,13 @@ e_cal_backend_file_get_backend_property (ECalBackend *backend,
comp = e_cal_component_new ();
switch (e_cal_backend_get_kind (E_CAL_BACKEND (backend))) {
- case ICAL_VEVENT_COMPONENT:
+ case I_CAL_VEVENT_COMPONENT:
e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
break;
- case ICAL_VTODO_COMPONENT:
+ case I_CAL_VTODO_COMPONENT:
e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_TODO);
break;
- case ICAL_VJOURNAL_COMPONENT:
+ case I_CAL_VJOURNAL_COMPONENT:
e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_JOURNAL);
break;
default:
@@ -3520,12 +3520,12 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
/* Set the created and last modified times on the component, if not there already */
current = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
- if (!e_cal_util_component_has_property (subcomp, ICAL_CREATED_PROPERTY)) {
+ if (!e_cal_util_component_has_property (subcomp, I_CAL_CREATED_PROPERTY)) {
/* Update both when CREATED is missing, to make sure the LAST-MODIFIED
is not before CREATED */
e_cal_component_set_created (comp, current);
e_cal_component_set_last_modified (comp, current);
- } else if (!e_cal_util_component_has_property (subcomp, ICAL_LASTMODIFIED_PROPERTY)) {
+ } else if (!e_cal_util_component_has_property (subcomp, I_CAL_LASTMODIFIED_PROPERTY)) {
e_cal_component_set_last_modified (comp, current);
}
@@ -3540,9 +3540,9 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
method = toplevel_method;
switch (method) {
- case ICAL_METHOD_PUBLISH:
- case ICAL_METHOD_REQUEST:
- case ICAL_METHOD_REPLY:
+ case I_CAL_METHOD_PUBLISH:
+ case I_CAL_METHOD_REQUEST:
+ case I_CAL_METHOD_REPLY:
is_declined = e_cal_backend_user_declined (registry, subcomp);
/* handle attachments */
@@ -3596,26 +3596,26 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
}
g_free (rid);
break;
- case ICAL_METHOD_ADD:
+ case I_CAL_METHOD_ADD:
/* FIXME This should be doable once all the recurid stuff is done */
err = EC_ERROR_EX (E_CLIENT_ERROR_OTHER_ERROR, _("Unsupported method"));
g_object_unref (comp);
g_free (rid);
goto error;
break;
- case ICAL_METHOD_COUNTER:
+ case I_CAL_METHOD_COUNTER:
err = EC_ERROR_EX (E_CLIENT_ERROR_OTHER_ERROR, _("Unsupported method"));
g_object_unref (comp);
g_free (rid);
goto error;
break;
- case ICAL_METHOD_DECLINECOUNTER:
+ case I_CAL_METHOD_DECLINECOUNTER:
err = EC_ERROR_EX (E_CLIENT_ERROR_OTHER_ERROR, _("Unsupported method"));
g_object_unref (comp);
g_free (rid);
goto error;
break;
- case ICAL_METHOD_CANCEL:
+ case I_CAL_METHOD_CANCEL:
if (cancel_received_object (cbfile, comp, &old_component, &new_component)) {
ECalComponentId *id;
diff --git a/src/calendar/backends/gtasks/e-cal-backend-gtasks-factory.c
b/src/calendar/backends/gtasks/e-cal-backend-gtasks-factory.c
index f7f5ed0e9..0b204ea21 100644
--- a/src/calendar/backends/gtasks/e-cal-backend-gtasks-factory.c
+++ b/src/calendar/backends/gtasks/e-cal-backend-gtasks-factory.c
@@ -49,7 +49,7 @@ e_cal_backend_gtasks_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VTODO_COMPONENT;
+ class->component_kind = I_CAL_VTODO_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_GTASKS;
}
diff --git a/src/calendar/backends/http/e-cal-backend-http-factory.c
b/src/calendar/backends/http/e-cal-backend-http-factory.c
index fb77c42ae..077d2978c 100644
--- a/src/calendar/backends/http/e-cal-backend-http-factory.c
+++ b/src/calendar/backends/http/e-cal-backend-http-factory.c
@@ -68,7 +68,7 @@ e_cal_backend_http_events_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VEVENT_COMPONENT;
+ class->component_kind = I_CAL_VEVENT_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_HTTP;
}
@@ -92,7 +92,7 @@ e_cal_backend_http_journal_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VJOURNAL_COMPONENT;
+ class->component_kind = I_CAL_VJOURNAL_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_HTTP;
}
@@ -116,7 +116,7 @@ e_cal_backend_http_todos_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VTODO_COMPONENT;
+ class->component_kind = I_CAL_VTODO_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_HTTP;
}
diff --git a/src/calendar/backends/weather/e-cal-backend-weather-factory.c
b/src/calendar/backends/weather/e-cal-backend-weather-factory.c
index d3c8d631c..fb34d07e8 100644
--- a/src/calendar/backends/weather/e-cal-backend-weather-factory.c
+++ b/src/calendar/backends/weather/e-cal-backend-weather-factory.c
@@ -50,7 +50,7 @@ e_cal_backend_weather_events_factory_class_init (ECalBackendFactoryClass *class)
backend_factory_class->share_subprocess = TRUE;
class->factory_name = FACTORY_NAME;
- class->component_kind = ICAL_VEVENT_COMPONENT;
+ class->component_kind = I_CAL_VEVENT_COMPONENT;
class->backend_type = E_TYPE_CAL_BACKEND_WEATHER;
}
diff --git a/src/calendar/libecal/e-cal-check-timezones.c b/src/calendar/libecal/e-cal-check-timezones.c
index c3325599b..5b8f9f458 100644
--- a/src/calendar/libecal/e-cal-check-timezones.c
+++ b/src/calendar/libecal/e-cal-check-timezones.c
@@ -405,9 +405,9 @@ e_cal_client_check_timezones_sync (ICalComponent *vcalendar,
/*
* now replace all TZID parameters in place
*/
- for (subcomp = i_cal_component_get_first_component (vcalendar, ICAL_ANY_COMPONENT);
+ for (subcomp = i_cal_component_get_first_component (vcalendar, I_CAL_ANY_COMPONENT);
subcomp;
- g_object_unref (subcomp), subcomp = i_cal_component_get_next_component (vcalendar,
ICAL_ANY_COMPONENT)) {
+ g_object_unref (subcomp), subcomp = i_cal_component_get_next_component (vcalendar,
I_CAL_ANY_COMPONENT)) {
/*
* Leave VTIMEZONE unchanged, iterate over properties of
* everything else.
diff --git a/src/calendar/libecal/e-cal-component-alarm-trigger.c
b/src/calendar/libecal/e-cal-component-alarm-trigger.c
index 2f073e531..7b5306206 100644
--- a/src/calendar/libecal/e-cal-component-alarm-trigger.c
+++ b/src/calendar/libecal/e-cal-component-alarm-trigger.c
@@ -259,7 +259,7 @@ e_cal_component_alarm_trigger_set_from_property (ECalComponentAlarmTrigger *trig
kind = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
break;
- case ICAL_RELATED_END:
+ case I_CAL_RELATED_END:
kind = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END;
break;
diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
index c4587ce70..3114f3e7b 100644
--- a/src/calendar/libecal/e-cal-recur.c
+++ b/src/calendar/libecal/e-cal-recur.c
@@ -2388,12 +2388,12 @@ cal_obj_expand_recurrence (CalObjTime *event_start,
for (;;) {
/* Generate the set of occurrences for this period. */
switch (recur->freq) {
- case ICAL_YEARLY_RECURRENCE:
+ case I_CAL_YEARLY_RECURRENCE:
occs = cal_obj_generate_set_yearly (
&recur_data,
&vtable, &occ);
break;
- case ICAL_MONTHLY_RECURRENCE:
+ case I_CAL_MONTHLY_RECURRENCE:
occs = cal_obj_generate_set_monthly (
&recur_data,
&vtable, &occ);
@@ -2661,29 +2661,29 @@ cal_obj_get_vtable (ECalRecurrence *recur,
gboolean valid = TRUE;
switch (recur->freq) {
- case ICAL_YEARLY_RECURRENCE:
+ case I_CAL_YEARLY_RECURRENCE:
*out_vtable = cal_obj_yearly_vtable;
break;
- case ICAL_MONTHLY_RECURRENCE:
+ case I_CAL_MONTHLY_RECURRENCE:
*out_vtable = cal_obj_monthly_vtable;
if (recur->bymonthday && recur->byday)
out_vtable->bymonthday_filter = cal_obj_bymonthday_filter;
else
out_vtable->bymonthday_filter = cal_obj_bymonthday_expand;
break;
- case ICAL_WEEKLY_RECURRENCE:
+ case I_CAL_WEEKLY_RECURRENCE:
*out_vtable = cal_obj_weekly_vtable;
break;
- case ICAL_DAILY_RECURRENCE:
+ case I_CAL_DAILY_RECURRENCE:
*out_vtable = cal_obj_daily_vtable;
break;
- case ICAL_HOURLY_RECURRENCE:
+ case I_CAL_HOURLY_RECURRENCE:
*out_vtable = cal_obj_hourly_vtable;
break;
- case ICAL_MINUTELY_RECURRENCE:
+ case I_CAL_MINUTELY_RECURRENCE:
*out_vtable = cal_obj_minutely_vtable;
break;
- case ICAL_SECONDLY_RECURRENCE:
+ case I_CAL_SECONDLY_RECURRENCE:
*out_vtable = cal_obj_secondly_vtable;
break;
default:
@@ -5231,7 +5231,7 @@ e_cal_recur_describe_recurrence (ICalComponent *icalcomp,
break;
}
- case ICAL_MONTHLY_RECURRENCE: {
+ case I_CAL_MONTHLY_RECURRENCE: {
enum month_num_options {
MONTH_NUM_INVALID = -1,
MONTH_NUM_FIRST,
diff --git a/src/calendar/libecal/e-cal-util.c b/src/calendar/libecal/e-cal-util.c
index 4c2ea83c2..ce0f60164 100644
--- a/src/calendar/libecal/e-cal-util.c
+++ b/src/calendar/libecal/e-cal-util.c
@@ -1592,9 +1592,9 @@ e_cal_util_split_at_instance (ICalComponent *icalcomp,
g_clear_object (&duration);
/* any RRULE with 'count' should be shortened */
- for (prop = i_cal_component_get_first_property (icalcomp, ICAL_RRULE_PROPERTY);
+ for (prop = i_cal_component_get_first_property (icalcomp, I_CAL_RRULE_PROPERTY);
prop;
- g_object_unref (prop), prop = i_cal_component_get_next_property (icalcomp, ICAL_RRULE_PROPERTY))
{
+ g_object_unref (prop), prop = i_cal_component_get_next_property (icalcomp,
I_CAL_RRULE_PROPERTY)) {
ICalTime *recur;
ICalRecurrence *rule;
gint rule_count;
diff --git a/src/calendar/libedata-cal/e-cal-backend-factory.c
b/src/calendar/libedata-cal/e-cal-backend-factory.c
index 2c73cdfa5..45763b164 100644
--- a/src/calendar/libedata-cal/e-cal-backend-factory.c
+++ b/src/calendar/libedata-cal/e-cal-backend-factory.c
@@ -61,13 +61,13 @@ cal_backend_factory_get_hash_key (EBackendFactory *factory)
g_return_val_if_fail (class->factory_name != NULL, NULL);
switch (class->component_kind) {
- case ICAL_VEVENT_COMPONENT:
+ case I_CAL_VEVENT_COMPONENT:
component_name = E_SOURCE_EXTENSION_CALENDAR;
break;
- case ICAL_VTODO_COMPONENT:
+ case I_CAL_VTODO_COMPONENT:
component_name = E_SOURCE_EXTENSION_TASK_LIST;
break;
- case ICAL_VJOURNAL_COMPONENT:
+ case I_CAL_VJOURNAL_COMPONENT:
component_name = E_SOURCE_EXTENSION_MEMO_LIST;
break;
default:
diff --git a/src/calendar/libedata-cal/e-cal-backend.c b/src/calendar/libedata-cal/e-cal-backend.c
index 9bd18dad2..77ca1eb36 100644
--- a/src/calendar/libedata-cal/e-cal-backend.c
+++ b/src/calendar/libedata-cal/e-cal-backend.c
@@ -975,9 +975,9 @@ e_cal_backend_class_init (ECalBackendClass *class)
"Kind",
"The kind of iCalendar components "
"this backend manages",
- ICAL_NO_COMPONENT,
- ICAL_XLICMIMEPART_COMPONENT,
- ICAL_NO_COMPONENT,
+ I_CAL_NO_COMPONENT,
+ I_CAL_XLICMIMEPART_COMPONENT,
+ I_CAL_NO_COMPONENT,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
@@ -1101,7 +1101,7 @@ e_cal_backend_init (ECalBackend *backend)
ICalComponentKind
e_cal_backend_get_kind (ECalBackend *backend)
{
- g_return_val_if_fail (E_IS_CAL_BACKEND (backend), ICAL_NO_COMPONENT);
+ g_return_val_if_fail (E_IS_CAL_BACKEND (backend), I_CAL_NO_COMPONENT);
return backend->priv->kind;
}
diff --git a/src/calendar/libedata-cal/e-cal-cache.c b/src/calendar/libedata-cal/e-cal-cache.c
index 3c9580b30..3e768e229 100644
--- a/src/calendar/libedata-cal/e-cal-cache.c
+++ b/src/calendar/libedata-cal/e-cal-cache.c
@@ -1431,7 +1431,7 @@ ecc_sexp_func_is_completed (ESExp *esexp,
result = e_sexp_result_new (esexp, ESEXP_RES_STRING);
result->value.string = g_strdup_printf ("%s NOT NULL OR (%s NOT NULL AND %s='%s')",
- ECC_COLUMN_COMPLETED, ECC_COLUMN_STATUS, ECC_COLUMN_STATUS, ecc_get_status_as_string
(ICAL_STATUS_COMPLETED));
+ ECC_COLUMN_COMPLETED, ECC_COLUMN_STATUS, ECC_COLUMN_STATUS, ecc_get_status_as_string
(I_CAL_STATUS_COMPLETED));
return result;
}
@@ -4408,7 +4408,7 @@ ecc_get_cached_timezone (ETimezoneCache *cache,
for (prop = i_cal_component_get_first_property (icomp, I_CAL_ANY_PROPERTY);
prop;
- g_object_unref (prop), prop = i_cal_component_get_next_property (icomp, ICAL_ANY_PROPERTY)) {
+ g_object_unref (prop), prop = i_cal_component_get_next_property (icomp, I_CAL_ANY_PROPERTY)) {
if (i_cal_property_isa (prop) == I_CAL_TZID_PROPERTY) {
i_cal_property_set_value_from_string (prop, tzid, "NO");
g_object_unref (prop);
diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
index 5a03cba47..69a0d0c4b 100644
--- a/src/calendar/libedata-cal/e-cal-meta-backend.c
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
@@ -2857,13 +2857,13 @@ ecmb_get_backend_property (ECalBackend *cal_backend,
comp = e_cal_component_new ();
switch (e_cal_backend_get_kind (cal_backend)) {
- case ICAL_VEVENT_COMPONENT:
+ case I_CAL_VEVENT_COMPONENT:
e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
break;
- case ICAL_VTODO_COMPONENT:
+ case I_CAL_VTODO_COMPONENT:
e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_TODO);
break;
- case ICAL_VJOURNAL_COMPONENT:
+ case I_CAL_VJOURNAL_COMPONENT:
e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_JOURNAL);
break;
default:
diff --git a/src/calendar/libedata-cal/e-subprocess-cal-factory.c
b/src/calendar/libedata-cal/e-subprocess-cal-factory.c
index 22fb66059..e89d2b817 100644
--- a/src/calendar/libedata-cal/e-subprocess-cal-factory.c
+++ b/src/calendar/libedata-cal/e-subprocess-cal-factory.c
@@ -137,7 +137,7 @@ ESubprocessCalFactory *
e_subprocess_cal_factory_new (GCancellable *cancellable,
GError **error)
{
- i_cal_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
+ i_cal_set_unknown_token_handling_setting (I_CAL_DISCARD_TOKEN);
return g_initable_new (
E_TYPE_SUBPROCESS_CAL_FACTORY,
diff --git a/src/services/evolution-calendar-factory/evolution-calendar-factory.c
b/src/services/evolution-calendar-factory/evolution-calendar-factory.c
index 08a07a64b..d4d8a4d67 100644
--- a/src/services/evolution-calendar-factory/evolution-calendar-factory.c
+++ b/src/services/evolution-calendar-factory/evolution-calendar-factory.c
@@ -84,7 +84,7 @@ main (gint argc,
exit (EXIT_FAILURE);
}
- ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
+ i_cal_set_unknown_token_handling_setting (I_CAL_DISCARD_TOKEN);
e_xml_initialize_in_main ();
diff --git a/tests/libedata-cal/test-cal-meta-backend.c b/tests/libedata-cal/test-cal-meta-backend.c
index 3d305de56..327898188 100644
--- a/tests/libedata-cal/test-cal-meta-backend.c
+++ b/tests/libedata-cal/test-cal-meta-backend.c
@@ -724,7 +724,7 @@ e_cal_meta_backend_test_new (ECalCache *cache)
meta_backend = g_object_new (E_TYPE_CAL_META_BACKEND_TEST,
"source", scratch,
"registry", glob_registry,
- "kind", ICAL_VEVENT_COMPONENT,
+ "kind", I_CAL_VEVENT_COMPONENT,
NULL);
g_assert_nonnull (meta_backend);
@@ -2461,7 +2461,7 @@ test_receive_objects (ECalMetaBackend *meta_backend)
icomp = i_cal_component_new_from_string (calobj);
g_assert_nonnull (icomp);
- firsticomp = i_cal_component_get_first_component (icomp, ICAL_VEVENT_COMPONENT);
+ firsticomp = i_cal_component_get_first_component (icomp, I_CAL_VEVENT_COMPONENT);
g_assert_nonnull (firsticomp);
g_free (calobj);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
