[evolution-data-server] Rename ECalBackendClass methods to address some gir warnings
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Rename ECalBackendClass methods to address some gir warnings
- Date: Fri, 17 May 2019 20:13:09 +0000 (UTC)
commit fcde1467e10e69bf141d7f6c79501cade2594796
Author: Milan Crha <mcrha redhat com>
Date: Fri May 17 09:02:35 2019 +0200
Rename ECalBackendClass methods to address some gir warnings
.../backends/caldav/e-cal-backend-caldav.c | 4 +-
.../backends/contacts/e-cal-backend-contacts.c | 10 ++--
src/calendar/backends/file/e-cal-backend-file.c | 10 ++--
.../backends/gtasks/e-cal-backend-gtasks.c | 4 +-
.../backends/weather/e-cal-backend-weather.c | 10 ++--
src/calendar/libedata-cal/CMakeLists.txt | 2 +-
src/calendar/libedata-cal/e-cal-backend-sexp.c | 10 ++--
src/calendar/libedata-cal/e-cal-backend-sync.c | 28 ++++-----
src/calendar/libedata-cal/e-cal-backend.c | 70 +++++++++++-----------
src/calendar/libedata-cal/e-cal-backend.h | 70 +++++++++++-----------
src/calendar/libedata-cal/e-cal-meta-backend.c | 8 +--
src/calendar/libedata-cal/e-data-cal.c | 2 +-
tests/libedata-cal/test-cal-meta-backend.c | 4 +-
13 files changed, 114 insertions(+), 118 deletions(-)
---
diff --git a/src/calendar/backends/caldav/e-cal-backend-caldav.c
b/src/calendar/backends/caldav/e-cal-backend-caldav.c
index 616ce27c7..ad44150cc 100644
--- a/src/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/src/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -2076,7 +2076,7 @@ ecb_caldav_get_backend_property (ECalBackend *backend,
}
/* Chain up to parent's method. */
- return E_CAL_BACKEND_CLASS (e_cal_backend_caldav_parent_class)->get_backend_property (backend,
prop_name);
+ return E_CAL_BACKEND_CLASS (e_cal_backend_caldav_parent_class)->impl_get_backend_property (backend,
prop_name);
}
static void
@@ -2207,7 +2207,7 @@ e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *klass)
cal_backend_sync_class->get_free_busy_sync = ecb_caldav_get_free_busy_sync;
cal_backend_class = E_CAL_BACKEND_CLASS (klass);
- cal_backend_class->get_backend_property = ecb_caldav_get_backend_property;
+ cal_backend_class->impl_get_backend_property = ecb_caldav_get_backend_property;
object_class = G_OBJECT_CLASS (klass);
object_class->constructed = e_cal_backend_caldav_constructed;
diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c
b/src/calendar/backends/contacts/e-cal-backend-contacts.c
index 89bf48cdf..270658405 100644
--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -1063,9 +1063,8 @@ e_cal_backend_contacts_get_backend_property (ECalBackend *backend,
return NULL;
}
- /* Chain up to parent's get_backend_property() method. */
- return E_CAL_BACKEND_CLASS (e_cal_backend_contacts_parent_class)->
- get_backend_property (backend, prop_name);
+ /* Chain up to parent's method. */
+ return E_CAL_BACKEND_CLASS (e_cal_backend_contacts_parent_class)->impl_get_backend_property (backend,
prop_name);
}
static void
@@ -1438,7 +1437,8 @@ e_cal_backend_contacts_class_init (ECalBackendContactsClass *class)
/* Execute one method at a time. */
backend_class->use_serial_dispatch_queue = TRUE;
- backend_class->get_backend_property = e_cal_backend_contacts_get_backend_property;
+ backend_class->impl_get_backend_property = e_cal_backend_contacts_get_backend_property;
+ backend_class->impl_start_view = e_cal_backend_contacts_start_view;
sync_class->open_sync = e_cal_backend_contacts_open;
sync_class->create_objects_sync = e_cal_backend_contacts_create_objects;
@@ -1449,8 +1449,6 @@ e_cal_backend_contacts_class_init (ECalBackendContactsClass *class)
sync_class->add_timezone_sync = e_cal_backend_contacts_add_timezone;
sync_class->get_free_busy_sync = e_cal_backend_contacts_get_free_busy;
- backend_class->start_view = e_cal_backend_contacts_start_view;
-
/* Register our ESource extension. */
E_TYPE_SOURCE_CONTACTS;
}
diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
index 30223aadb..8e86c25b3 100644
--- a/src/calendar/backends/file/e-cal-backend-file.c
+++ b/src/calendar/backends/file/e-cal-backend-file.c
@@ -517,9 +517,8 @@ e_cal_backend_file_get_backend_property (ECalBackend *backend,
return revision;
}
- /* Chain up to parent's get_backend_property() method. */
- return E_CAL_BACKEND_CLASS (e_cal_backend_file_parent_class)->
- get_backend_property (backend, prop_name);
+ /* Chain up to parent's method. */
+ return E_CAL_BACKEND_CLASS (e_cal_backend_file_parent_class)->impl_get_backend_property (backend,
prop_name);
}
typedef struct _ResolveTzidData {
@@ -3820,7 +3819,8 @@ e_cal_backend_file_class_init (ECalBackendFileClass *class)
object_class->finalize = e_cal_backend_file_finalize;
object_class->constructed = cal_backend_file_constructed;
- backend_class->get_backend_property = e_cal_backend_file_get_backend_property;
+ backend_class->impl_get_backend_property = e_cal_backend_file_get_backend_property;
+ backend_class->impl_start_view = e_cal_backend_file_start_view;
sync_class->open_sync = e_cal_backend_file_open;
sync_class->create_objects_sync = e_cal_backend_file_create_objects;
@@ -3834,8 +3834,6 @@ e_cal_backend_file_class_init (ECalBackendFileClass *class)
sync_class->add_timezone_sync = e_cal_backend_file_add_timezone;
sync_class->get_free_busy_sync = e_cal_backend_file_get_free_busy;
- backend_class->start_view = e_cal_backend_file_start_view;
-
/* Register our ESource extension. */
E_TYPE_SOURCE_LOCAL;
}
diff --git a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
index 7be8e8876..86dbff83c 100644
--- a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
+++ b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
@@ -486,7 +486,7 @@ ecb_gtasks_get_backend_property (ECalBackend *cal_backend,
}
/* Chain up to parent's method. */
- return E_CAL_BACKEND_CLASS (e_cal_backend_gtasks_parent_class)->get_backend_property (cal_backend,
prop_name);
+ return E_CAL_BACKEND_CLASS (e_cal_backend_gtasks_parent_class)->impl_get_backend_property
(cal_backend, prop_name);
}
static gboolean
@@ -1150,7 +1150,7 @@ e_cal_backend_gtasks_class_init (ECalBackendGTasksClass *klass)
cal_meta_backend_class->requires_reconnect = ecb_gtasks_requires_reconnect;
cal_backend_class = E_CAL_BACKEND_CLASS (klass);
- cal_backend_class->get_backend_property = ecb_gtasks_get_backend_property;
+ cal_backend_class->impl_get_backend_property = ecb_gtasks_get_backend_property;
object_class = G_OBJECT_CLASS (klass);
object_class->constructed = ecb_gtasks_constructed;
diff --git a/src/calendar/backends/weather/e-cal-backend-weather.c
b/src/calendar/backends/weather/e-cal-backend-weather.c
index c86571487..8c4208db9 100644
--- a/src/calendar/backends/weather/e-cal-backend-weather.c
+++ b/src/calendar/backends/weather/e-cal-backend-weather.c
@@ -652,9 +652,8 @@ e_cal_backend_weather_get_backend_property (ECalBackend *backend,
return NULL;
}
- /* Chain up to parent's get_backend_property() method. */
- return E_CAL_BACKEND_CLASS (e_cal_backend_weather_parent_class)->
- get_backend_property (backend, prop_name);
+ /* Chain up to parent's method. */
+ return E_CAL_BACKEND_CLASS (e_cal_backend_weather_parent_class)->impl_get_backend_property (backend,
prop_name);
}
static void
@@ -1083,7 +1082,8 @@ e_cal_backend_weather_class_init (ECalBackendWeatherClass *class)
/* Execute one method at a time. */
backend_class->use_serial_dispatch_queue = TRUE;
- backend_class->get_backend_property = e_cal_backend_weather_get_backend_property;
+ backend_class->impl_get_backend_property = e_cal_backend_weather_get_backend_property;
+ backend_class->impl_start_view = e_cal_backend_weather_start_view;
sync_class->open_sync = e_cal_backend_weather_open;
sync_class->refresh_sync = e_cal_backend_weather_refresh;
@@ -1093,8 +1093,6 @@ e_cal_backend_weather_class_init (ECalBackendWeatherClass *class)
sync_class->add_timezone_sync = e_cal_backend_weather_add_timezone;
sync_class->get_free_busy_sync = e_cal_backend_weather_get_free_busy;
- backend_class->start_view = e_cal_backend_weather_start_view;
-
/* Register our ESource extension. */
g_type_ensure (E_TYPE_SOURCE_WEATHER);
}
diff --git a/src/calendar/libedata-cal/CMakeLists.txt b/src/calendar/libedata-cal/CMakeLists.txt
index 1af529311..e85555a3f 100644
--- a/src/calendar/libedata-cal/CMakeLists.txt
+++ b/src/calendar/libedata-cal/CMakeLists.txt
@@ -90,7 +90,7 @@ install(FILES ${HEADERS}
)
set(gir_sources ${SOURCES} ${HEADERS})
-set(gir_identifies_prefixes EDataCal E)
+set(gir_identifies_prefixes E)
set(gir_includes GObject-2.0 Gio-2.0 Soup-2.4 libxml2-2.0 ICalGLib-3.0)
set(gir_cflags
-DLIBEDATA_CAL_COMPILATION
diff --git a/src/calendar/libedata-cal/e-cal-backend-sexp.c b/src/calendar/libedata-cal/e-cal-backend-sexp.c
index 2b2240f17..4468e3d69 100644
--- a/src/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/src/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -1356,7 +1356,7 @@ e_cal_backend_sexp_match_object (ECalBackendSExp *sexp,
}
/**
- * e_cal_backend_sexp_func_time_now:
+ * e_cal_backend_sexp_func_time_now: (skip)
* @esexp: An #ESExp object.
* @argc: Number of arguments.
* @argv: The arguments.
@@ -1390,7 +1390,7 @@ e_cal_backend_sexp_func_time_now (ESExp *esexp,
}
/**
- * e_cal_backend_sexp_func_make_time:
+ * e_cal_backend_sexp_func_make_time: (skip)
* @esexp: An #ESExp object.
* @argc: Number of arguments.
* @argv: The arguments.
@@ -1455,7 +1455,7 @@ e_cal_backend_sexp_func_make_time (ESExp *esexp,
}
/**
- * e_cal_backend_sexp_func_time_add_day:
+ * e_cal_backend_sexp_func_time_add_day: (skip)
* @esexp: An #ESExp object.
* @argc: Number of arguments.
* @argv: The arguments.
@@ -1516,7 +1516,7 @@ e_cal_backend_sexp_func_time_add_day (ESExp *esexp,
}
/**
- * e_cal_backend_sexp_func_time_day_begin:
+ * e_cal_backend_sexp_func_time_day_begin: (skip)
* @esexp: An #ESExp object.
* @argc: Number of arguments.
* @argv: The arguments.
@@ -1565,7 +1565,7 @@ e_cal_backend_sexp_func_time_day_begin (ESExp *esexp,
}
/**
- * e_cal_backend_sexp_func_time_day_end:
+ * e_cal_backend_sexp_func_time_day_end: (skip)
* @esexp: An #ESExp object.
* @argc: Number of arguments.
* @argv: The arguments.
diff --git a/src/calendar/libedata-cal/e-cal-backend-sync.c b/src/calendar/libedata-cal/e-cal-backend-sync.c
index 78d994497..d35e24b33 100644
--- a/src/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/src/calendar/libedata-cal/e-cal-backend-sync.c
@@ -962,20 +962,20 @@ e_cal_backend_sync_class_init (ECalBackendSyncClass *class)
ECalBackendClass *backend_class;
backend_class = E_CAL_BACKEND_CLASS (class);
- backend_class->open = cal_backend_open;
- backend_class->refresh = cal_backend_refresh;
- backend_class->get_object = cal_backend_get_object;
- backend_class->get_object_list = cal_backend_get_object_list;
- backend_class->get_free_busy = cal_backend_get_free_busy;
- backend_class->create_objects = cal_backend_create_objects;
- backend_class->modify_objects = cal_backend_modify_objects;
- backend_class->remove_objects = cal_backend_remove_objects;
- backend_class->receive_objects = cal_backend_receive_objects;
- backend_class->send_objects = cal_backend_send_objects;
- backend_class->get_attachment_uris = cal_backend_get_attachment_uris;
- backend_class->discard_alarm = cal_backend_discard_alarm;
- backend_class->get_timezone = cal_backend_get_timezone;
- backend_class->add_timezone = cal_backend_add_timezone;
+ backend_class->impl_open = cal_backend_open;
+ backend_class->impl_refresh = cal_backend_refresh;
+ backend_class->impl_get_object = cal_backend_get_object;
+ backend_class->impl_get_object_list = cal_backend_get_object_list;
+ backend_class->impl_get_free_busy = cal_backend_get_free_busy;
+ backend_class->impl_create_objects = cal_backend_create_objects;
+ backend_class->impl_modify_objects = cal_backend_modify_objects;
+ backend_class->impl_remove_objects = cal_backend_remove_objects;
+ backend_class->impl_receive_objects = cal_backend_receive_objects;
+ backend_class->impl_send_objects = cal_backend_send_objects;
+ backend_class->impl_get_attachment_uris = cal_backend_get_attachment_uris;
+ backend_class->impl_discard_alarm = cal_backend_discard_alarm;
+ backend_class->impl_get_timezone = cal_backend_get_timezone;
+ backend_class->impl_add_timezone = cal_backend_add_timezone;
}
static void
diff --git a/src/calendar/libedata-cal/e-cal-backend.c b/src/calendar/libedata-cal/e-cal-backend.c
index 3e2144b49..9bd18dad2 100644
--- a/src/calendar/libedata-cal/e-cal-backend.c
+++ b/src/calendar/libedata-cal/e-cal-backend.c
@@ -952,7 +952,7 @@ e_cal_backend_class_init (ECalBackendClass *class)
backend_class->prepare_shutdown = cal_backend_prepare_shutdown;
class->use_serial_dispatch_queue = TRUE;
- class->get_backend_property = cal_backend_get_backend_property;
+ class->impl_get_backend_property = cal_backend_get_backend_property;
class->shutdown = cal_backend_shutdown;
g_object_class_install_property (
@@ -1426,9 +1426,9 @@ e_cal_backend_get_backend_property (ECalBackend *backend,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_val_if_fail (class != NULL, NULL);
- g_return_val_if_fail (class->get_backend_property != NULL, NULL);
+ g_return_val_if_fail (class->impl_get_backend_property != NULL, NULL);
- return class->get_backend_property (backend, prop_name);
+ return class->impl_get_backend_property (backend, prop_name);
}
/**
@@ -1591,7 +1591,7 @@ cal_backend_open_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->open != NULL);
+ g_return_if_fail (class->impl_open != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -1606,7 +1606,7 @@ cal_backend_open_thread (GSimpleAsyncResult *simple,
e_backend_ensure_online_state_updated (E_BACKEND (backend), cancellable);
- class->open (backend, data_cal, opid, cancellable);
+ class->impl_open (backend, data_cal, opid, cancellable);
}
g_object_unref (data_cal);
@@ -1755,7 +1755,7 @@ cal_backend_refresh_thread (GSimpleAsyncResult *simple,
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
- if (class->refresh == NULL) {
+ if (class->impl_refresh == NULL) {
g_simple_async_result_set_error (
simple, E_CLIENT_ERROR,
E_CLIENT_ERROR_NOT_SUPPORTED,
@@ -1776,7 +1776,7 @@ cal_backend_refresh_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->refresh (backend, data_cal, opid, cancellable);
+ class->impl_refresh (backend, data_cal, opid, cancellable);
}
g_object_unref (data_cal);
@@ -1925,7 +1925,7 @@ cal_backend_get_object_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->get_object != NULL);
+ g_return_if_fail (class->impl_get_object != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -1945,7 +1945,7 @@ cal_backend_get_object_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->get_object (
+ class->impl_get_object (
backend, data_cal, opid, cancellable,
async_context->uid,
async_context->rid);
@@ -2119,7 +2119,7 @@ cal_backend_get_object_list_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->get_object_list != NULL);
+ g_return_if_fail (class->impl_get_object_list != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -2139,7 +2139,7 @@ cal_backend_get_object_list_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->get_object_list (
+ class->impl_get_object_list (
backend, data_cal, opid, cancellable,
async_context->query);
}
@@ -2315,7 +2315,7 @@ cal_backend_get_free_busy_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->get_free_busy != NULL);
+ g_return_if_fail (class->impl_get_free_busy != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -2335,7 +2335,7 @@ cal_backend_get_free_busy_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->get_free_busy (
+ class->impl_get_free_busy (
backend, data_cal, opid, cancellable,
async_context->string_list,
async_context->start,
@@ -2541,7 +2541,7 @@ cal_backend_create_objects_thread (GSimpleAsyncResult *simple,
async_context = g_simple_async_result_get_op_res_gpointer (simple);
- if (class->create_objects == NULL) {
+ if (class->impl_create_objects == NULL) {
g_simple_async_result_set_error (
simple, E_CLIENT_ERROR,
E_CLIENT_ERROR_NOT_SUPPORTED,
@@ -2562,7 +2562,7 @@ cal_backend_create_objects_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->create_objects (
+ class->impl_create_objects (
backend, data_cal, opid, cancellable,
async_context->string_list, async_context->opflags);
}
@@ -2768,7 +2768,7 @@ cal_backend_modify_objects_thread (GSimpleAsyncResult *simple,
async_context = g_simple_async_result_get_op_res_gpointer (simple);
- if (class->modify_objects == NULL) {
+ if (class->impl_modify_objects == NULL) {
g_simple_async_result_set_error (
simple, E_CLIENT_ERROR,
E_CLIENT_ERROR_NOT_SUPPORTED,
@@ -2789,7 +2789,7 @@ cal_backend_modify_objects_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->modify_objects (
+ class->impl_modify_objects (
backend, data_cal, opid, cancellable,
async_context->string_list,
async_context->mod,
@@ -3001,7 +3001,7 @@ cal_backend_remove_objects_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->remove_objects != NULL);
+ g_return_if_fail (class->impl_remove_objects != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -3021,7 +3021,7 @@ cal_backend_remove_objects_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->remove_objects (
+ class->impl_remove_objects (
backend, data_cal, opid, cancellable,
async_context->compid_list,
async_context->mod,
@@ -3246,7 +3246,7 @@ cal_backend_receive_objects_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->receive_objects != NULL);
+ g_return_if_fail (class->impl_receive_objects != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -3266,7 +3266,7 @@ cal_backend_receive_objects_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->receive_objects (
+ class->impl_receive_objects (
backend, data_cal, opid, cancellable,
async_context->calobj,
async_context->opflags);
@@ -3432,7 +3432,7 @@ cal_backend_send_objects_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->send_objects != NULL);
+ g_return_if_fail (class->impl_send_objects != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -3452,7 +3452,7 @@ cal_backend_send_objects_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->send_objects (
+ class->impl_send_objects (
backend, data_cal, opid, cancellable,
async_context->calobj,
async_context->opflags);
@@ -3634,7 +3634,7 @@ cal_backend_get_attachment_uris_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->get_attachment_uris != NULL);
+ g_return_if_fail (class->impl_get_attachment_uris != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -3654,7 +3654,7 @@ cal_backend_get_attachment_uris_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->get_attachment_uris (
+ class->impl_get_attachment_uris (
backend, data_cal, opid, cancellable,
async_context->uid,
async_context->rid);
@@ -3839,7 +3839,7 @@ cal_backend_discard_alarm_thread (GSimpleAsyncResult *simple,
async_context = g_simple_async_result_get_op_res_gpointer (simple);
- if (class->discard_alarm == NULL) {
+ if (class->impl_discard_alarm == NULL) {
g_simple_async_result_set_error (
simple, E_CLIENT_ERROR,
E_CLIENT_ERROR_NOT_SUPPORTED,
@@ -3860,7 +3860,7 @@ cal_backend_discard_alarm_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->discard_alarm (
+ class->impl_discard_alarm (
backend, data_cal, opid, cancellable,
async_context->uid,
async_context->rid,
@@ -4027,7 +4027,7 @@ cal_backend_get_timezone_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->get_timezone != NULL);
+ g_return_if_fail (class->impl_get_timezone != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -4047,7 +4047,7 @@ cal_backend_get_timezone_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->get_timezone (
+ class->impl_get_timezone (
backend, data_cal, opid, cancellable,
async_context->tzid);
}
@@ -4214,7 +4214,7 @@ cal_backend_add_timezone_thread (GSimpleAsyncResult *simple,
class = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (class != NULL);
- g_return_if_fail (class->add_timezone != NULL);
+ g_return_if_fail (class->impl_add_timezone != NULL);
data_cal = e_cal_backend_ref_data_cal (backend);
g_return_if_fail (data_cal != NULL);
@@ -4234,7 +4234,7 @@ cal_backend_add_timezone_thread (GSimpleAsyncResult *simple,
opid = cal_backend_stash_operation (backend, simple);
- class->add_timezone (
+ class->impl_add_timezone (
backend, data_cal, opid, cancellable,
async_context->tzobject);
}
@@ -4346,9 +4346,9 @@ e_cal_backend_start_view (ECalBackend *backend,
klass = E_CAL_BACKEND_GET_CLASS (backend);
g_return_if_fail (klass != NULL);
- g_return_if_fail (klass->start_view != NULL);
+ g_return_if_fail (klass->impl_start_view != NULL);
- klass->start_view (backend, view);
+ klass->impl_start_view (backend, view);
}
/**
@@ -4373,8 +4373,8 @@ e_cal_backend_stop_view (ECalBackend *backend,
g_return_if_fail (klass != NULL);
/* backward compatibility, do not force each backend define this function */
- if (klass->stop_view)
- klass->stop_view (backend, view);
+ if (klass->impl_stop_view)
+ klass->impl_stop_view (backend, view);
}
/**
diff --git a/src/calendar/libedata-cal/e-cal-backend.h b/src/calendar/libedata-cal/e-cal-backend.h
index 9c6a5a64b..57d17fbe7 100644
--- a/src/calendar/libedata-cal/e-cal-backend.h
+++ b/src/calendar/libedata-cal/e-cal-backend.h
@@ -68,23 +68,23 @@ struct _ECalBackend {
* ECalBackendClass:
* @use_serial_dispatch_queue: Whether a serial dispatch queue should
* be used for this backend or not. The default is %TRUE.
- * @get_backend_property: Fetch a property value by name from the backend
- * @open: Open the backend
- * @refresh: Refresh the backend
- * @get_object: Fetch a calendar object
- * @get_object_list: FIXME: Document me
- * @get_free_busy: FIXME: Document me
- * @create_objects: FIXME: Document me
- * @modify_objects: FIXME: Document me
- * @remove_objects: FIXME: Document me
- * @receive_objects: FIXME: Document me
- * @send_objects: FIXME: Document me
- * @get_attachment_uris: FIXME: Document me
- * @discard_alarm: FIXME: Document me
- * @get_timezone: FIXME: Document me
- * @add_timezone: FIXME: Document me
- * @start_view: Start up the specified view
- * @stop_view: Stop the specified view
+ * @impl_get_backend_property: Fetch a property value by name from the backend
+ * @impl_open: Open the backend
+ * @impl_refresh: Refresh the backend
+ * @impl_get_object: Fetch a calendar object
+ * @impl_get_object_list: FIXME: Document me
+ * @impl_get_free_busy: FIXME: Document me
+ * @impl_create_objects: FIXME: Document me
+ * @impl_modify_objects: FIXME: Document me
+ * @impl_remove_objects: FIXME: Document me
+ * @impl_receive_objects: FIXME: Document me
+ * @impl_send_objects: FIXME: Document me
+ * @impl_get_attachment_uris: FIXME: Document me
+ * @impl_discard_alarm: FIXME: Document me
+ * @impl_get_timezone: FIXME: Document me
+ * @impl_add_timezone: FIXME: Document me
+ * @impl_start_view: Start up the specified view
+ * @impl_stop_view: Stop the specified view
* @closed: A signal notifying that the backend was closed
* @shutdown: A signal notifying that the backend is being shut down
*
@@ -107,75 +107,77 @@ struct _ECalBackendClass {
gboolean use_serial_dispatch_queue;
/* Virtual methods */
- gchar * (*get_backend_property) (ECalBackend *backend,
+ gchar * (*impl_get_backend_property)
+ (ECalBackend *backend,
const gchar *prop_name);
- void (*open) (ECalBackend *backend,
+ void (*impl_open) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable);
- void (*refresh) (ECalBackend *backend,
+ void (*impl_refresh) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable);
- void (*get_object) (ECalBackend *backend,
+ void (*impl_get_object) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const gchar *uid,
const gchar *rid);
- void (*get_object_list) (ECalBackend *backend,
+ void (*impl_get_object_list) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const gchar *sexp);
- void (*get_free_busy) (ECalBackend *backend,
+ void (*impl_get_free_busy) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const GSList *users, /* gchar * */
time_t start,
time_t end);
- void (*create_objects) (ECalBackend *backend,
+ void (*impl_create_objects) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const GSList *calobjs, /* gchar * */
guint32 opflags); /* bit-or of ECalOperationFlags */
- void (*modify_objects) (ECalBackend *backend,
+ void (*impl_modify_objects) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const GSList *calobjs, /* gchar * */
ECalObjModType mod,
guint32 opflags); /* bit-or of ECalOperationFlags */
- void (*remove_objects) (ECalBackend *backend,
+ void (*impl_remove_objects) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const GSList *ids, /* ECalComponentId * */
ECalObjModType mod,
guint32 opflags); /* bit-or of ECalOperationFlags */
- void (*receive_objects) (ECalBackend *backend,
+ void (*impl_receive_objects) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const gchar *calobj,
guint32 opflags); /* bit-or of ECalOperationFlags */
- void (*send_objects) (ECalBackend *backend,
+ void (*impl_send_objects) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const gchar *calobj,
guint32 opflags); /* bit-or of ECalOperationFlags */
- void (*get_attachment_uris) (ECalBackend *backend,
+ void (*impl_get_attachment_uris)
+ (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const gchar *uid,
const gchar *rid);
- void (*discard_alarm) (ECalBackend *backend,
+ void (*impl_discard_alarm) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
@@ -183,20 +185,20 @@ struct _ECalBackendClass {
const gchar *rid,
const gchar *auid,
guint32 opflags); /* bit-or of ECalOperationFlags */
- void (*get_timezone) (ECalBackend *backend,
+ void (*impl_get_timezone) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const gchar *tzid);
- void (*add_timezone) (ECalBackend *backend,
+ void (*impl_add_timezone) (ECalBackend *backend,
EDataCal *cal,
guint32 opid,
GCancellable *cancellable,
const gchar *tzobject);
- void (*start_view) (ECalBackend *backend,
+ void (*impl_start_view) (ECalBackend *backend,
EDataCalView *view);
- void (*stop_view) (ECalBackend *backend,
+ void (*impl_stop_view) (ECalBackend *backend,
EDataCalView *view);
/* Signals */
diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
index 6455fe48b..5a03cba47 100644
--- a/src/calendar/libedata-cal/e-cal-meta-backend.c
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
@@ -2881,7 +2881,7 @@ ecmb_get_backend_property (ECalBackend *cal_backend,
}
/* Chain up to parent's method. */
- return E_CAL_BACKEND_CLASS (e_cal_meta_backend_parent_class)->get_backend_property (cal_backend,
prop_name);
+ return E_CAL_BACKEND_CLASS (e_cal_meta_backend_parent_class)->impl_get_backend_property (cal_backend,
prop_name);
}
static void
@@ -3410,9 +3410,9 @@ e_cal_meta_backend_class_init (ECalMetaBackendClass *klass)
cal_backend_sync_class->add_timezone_sync = ecmb_add_timezone_sync;
cal_backend_class = E_CAL_BACKEND_CLASS (klass);
- cal_backend_class->get_backend_property = ecmb_get_backend_property;
- cal_backend_class->start_view = ecmb_start_view;
- cal_backend_class->stop_view = ecmb_stop_view;
+ cal_backend_class->impl_get_backend_property = ecmb_get_backend_property;
+ cal_backend_class->impl_start_view = ecmb_start_view;
+ cal_backend_class->impl_stop_view = ecmb_stop_view;
backend_class = E_BACKEND_CLASS (klass);
backend_class->authenticate_sync = ecmb_authenticate_sync;
diff --git a/src/calendar/libedata-cal/e-data-cal.c b/src/calendar/libedata-cal/e-data-cal.c
index baccdfa2a..8be747e4a 100644
--- a/src/calendar/libedata-cal/e-data-cal.c
+++ b/src/calendar/libedata-cal/e-data-cal.c
@@ -2541,7 +2541,7 @@ e_data_cal_init (EDataCal *data_cal)
* method invocations and forwards them to the @backend. If the Calendar
* interface fails to export, the function sets @error and returns %NULL.
*
- * Returns: an #EDataCal, or %NULL on error
+ * Returns: (transfer full) (nullable): an #EDataCal, or %NULL on error
**/
EDataCal *
e_data_cal_new (ECalBackend *backend,
diff --git a/tests/libedata-cal/test-cal-meta-backend.c b/tests/libedata-cal/test-cal-meta-backend.c
index 460c86d92..3d305de56 100644
--- a/tests/libedata-cal/test-cal-meta-backend.c
+++ b/tests/libedata-cal/test-cal-meta-backend.c
@@ -292,7 +292,7 @@ e_cal_meta_backend_test_get_backend_property (ECalBackend *cal_backend,
}
/* Chain up to parent's method. */
- return E_CAL_BACKEND_CLASS (e_cal_meta_backend_test_parent_class)->get_backend_property (cal_backend,
prop_name);
+ return E_CAL_BACKEND_CLASS (e_cal_meta_backend_test_parent_class)->impl_get_backend_property
(cal_backend, prop_name);
}
static gboolean
@@ -668,7 +668,7 @@ e_cal_meta_backend_test_class_init (ECalMetaBackendTestClass *klass)
cal_meta_backend_class->remove_component_sync = e_cal_meta_backend_test_remove_component_sync;
cal_backend_class = E_CAL_BACKEND_CLASS (klass);
- cal_backend_class->get_backend_property = e_cal_meta_backend_test_get_backend_property;
+ cal_backend_class->impl_get_backend_property = e_cal_meta_backend_test_get_backend_property;
object_class = G_OBJECT_CLASS (klass);
object_class->constructed = e_cal_meta_backend_test_constructed;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
