[evolution-data-server/wip/mcrha/libical-glib] Rename ETimezoneCacheInterface methods - to have vala binding possible for libedata-cal

[Milan Crha <mcrha src gnome org>]

commit a8b785358c3008e63de0d634eeadbbeb0a01eaae
Author: Milan Crha <mcrha redhat com>
Date:   Tue Apr 30 20:32:36 2019 +0200

    Rename ETimezoneCacheInterface methods - to have vala binding possible for libedata-cal

 src/calendar/backends/file/e-cal-backend-file.c |  8 ++++----
 src/calendar/libecal/e-cal-client.c             |  6 +++---
 src/calendar/libecal/e-timezone-cache.c         | 12 ++++++------
 src/calendar/libecal/e-timezone-cache.h         | 15 ++++++++-------
 src/calendar/libedata-cal/e-cal-backend.c       |  6 +++---
 src/calendar/libedata-cal/e-cal-cache.c         |  6 +++---
 src/calendar/libedata-cal/e-cal-meta-backend.c  | 10 +++++-----
 7 files changed, 32 insertions(+), 31 deletions(-)
---
diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
index 8f1be6d57..47078a7f0 100644
--- a/src/calendar/backends/file/e-cal-backend-file.c
+++ b/src/calendar/backends/file/e-cal-backend-file.c
@@ -3788,7 +3788,7 @@ cal_backend_file_get_cached_timezone (ETimezoneCache *cache,
 
        /* Chain up and let ECalBackend try to match
         * the TZID against a built-in ICalTimezone. */
-       return parent_timezone_cache_interface->get_timezone (cache, tzid);
+       return parent_timezone_cache_interface->tzcache_get_timezone (cache, tzid);
 }
 
 static GList *
@@ -3843,9 +3843,9 @@ e_cal_backend_file_timezone_cache_init (ETimezoneCacheInterface *iface)
 {
        parent_timezone_cache_interface = g_type_interface_peek_parent (iface);
 
-       iface->add_timezone = cal_backend_file_add_cached_timezone;
-       iface->get_timezone = cal_backend_file_get_cached_timezone;
-       iface->list_timezones = cal_backend_file_list_cached_timezones;
+       iface->tzcache_add_timezone = cal_backend_file_add_cached_timezone;
+       iface->tzcache_get_timezone = cal_backend_file_get_cached_timezone;
+       iface->tzcache_list_timezones = cal_backend_file_list_cached_timezones;
 }
 
 static void
diff --git a/src/calendar/libecal/e-cal-client.c b/src/calendar/libecal/e-cal-client.c
index 637398bea..409334bda 100644
--- a/src/calendar/libecal/e-cal-client.c
+++ b/src/calendar/libecal/e-cal-client.c
@@ -1618,9 +1618,9 @@ e_cal_client_async_initable_init (GAsyncInitableIface *iface)
 static void
 e_cal_client_timezone_cache_init (ETimezoneCacheInterface *iface)
 {
-       iface->add_timezone = cal_client_add_cached_timezone;
-       iface->get_timezone = cal_client_get_cached_timezone;
-       iface->list_timezones = cal_client_list_cached_timezones;
+       iface->tzcache_add_timezone = cal_client_add_cached_timezone;
+       iface->tzcache_get_timezone = cal_client_get_cached_timezone;
+       iface->tzcache_list_timezones = cal_client_list_cached_timezones;
 }
 
 static void
diff --git a/src/calendar/libecal/e-timezone-cache.c b/src/calendar/libecal/e-timezone-cache.c
index dee781ac5..e0fb39439 100644
--- a/src/calendar/libecal/e-timezone-cache.c
+++ b/src/calendar/libecal/e-timezone-cache.c
@@ -80,9 +80,9 @@ e_timezone_cache_add_timezone (ETimezoneCache *cache,
        g_return_if_fail (zone != NULL);
 
        iface = E_TIMEZONE_CACHE_GET_INTERFACE (cache);
-       g_return_if_fail (iface->add_timezone != NULL);
+       g_return_if_fail (iface->tzcache_add_timezone != NULL);
 
-       iface->add_timezone (cache, zone);
+       iface->tzcache_add_timezone (cache, zone);
 }
 
 /**
@@ -108,9 +108,9 @@ e_timezone_cache_get_timezone (ETimezoneCache *cache,
        g_return_val_if_fail (tzid != NULL, NULL);
 
        iface = E_TIMEZONE_CACHE_GET_INTERFACE (cache);
-       g_return_val_if_fail (iface->get_timezone != NULL, NULL);
+       g_return_val_if_fail (iface->tzcache_get_timezone != NULL, NULL);
 
-       return iface->get_timezone (cache, tzid);
+       return iface->tzcache_get_timezone (cache, tzid);
 }
 
 /**
@@ -138,7 +138,7 @@ e_timezone_cache_list_timezones (ETimezoneCache *cache)
        g_return_val_if_fail (E_IS_TIMEZONE_CACHE (cache), NULL);
 
        iface = E_TIMEZONE_CACHE_GET_INTERFACE (cache);
-       g_return_val_if_fail (iface->list_timezones != NULL, NULL);
+       g_return_val_if_fail (iface->tzcache_list_timezones != NULL, NULL);
 
-       return iface->list_timezones (cache);
+       return iface->tzcache_list_timezones (cache);
 }
diff --git a/src/calendar/libecal/e-timezone-cache.h b/src/calendar/libecal/e-timezone-cache.h
index 91240bd80..be8564eae 100644
--- a/src/calendar/libecal/e-timezone-cache.h
+++ b/src/calendar/libecal/e-timezone-cache.h
@@ -50,10 +50,10 @@ typedef struct _ETimezoneCacheInterface ETimezoneCacheInterface;
 
 /**
  * ETimezoneCacheInterface:
- * @add_timezone: a method to add timezone to the cache
- * @get_timezone: a method to get timezone from the cache, identified by its timezone id
- * @list_timezones: a method to get list of all stored timezones
- * @timezone_added: a signal emitted when a timezone is added to the cache
+ * @impl_add_timezone: a method to add timezone to the cache
+ * @impl_get_timezone: a method to get timezone from the cache, identified by its timezone id
+ * @impl_list_timezones: a method to get list of all stored timezones
+ * @impl_timezone_added: a signal emitted when a timezone is added to the cache
  *
  * Since: 3.8
  **/
@@ -63,11 +63,12 @@ struct _ETimezoneCacheInterface {
 
        /*< public >*/
        /* Methods */
-       void            (*add_timezone)         (ETimezoneCache *cache,
+       void            (*tzcache_add_timezone) (ETimezoneCache *cache,
                                                 ICalTimezone *zone);
-       ICalTimezone *  (*get_timezone)         (ETimezoneCache *cache,
+       ICalTimezone *  (*tzcache_get_timezone) (ETimezoneCache *cache,
                                                 const gchar *tzid);
-       GList *         (*list_timezones)       (ETimezoneCache *cache); /* ICalTimezone * */
+       GList *         (*tzcache_list_timezones)
+                                               (ETimezoneCache *cache); /* ICalTimezone * */
 
        /* Signals */
        void            (*timezone_added)       (ETimezoneCache *cache,
diff --git a/src/calendar/libedata-cal/e-cal-backend.c b/src/calendar/libedata-cal/e-cal-backend.c
index 2ba1674c6..bbdd7a053 100644
--- a/src/calendar/libedata-cal/e-cal-backend.c
+++ b/src/calendar/libedata-cal/e-cal-backend.c
@@ -1057,9 +1057,9 @@ e_cal_backend_class_init (ECalBackendClass *class)
 static void
 e_cal_backend_timezone_cache_init (ETimezoneCacheInterface *iface)
 {
-       iface->add_timezone = cal_backend_add_cached_timezone;
-       iface->get_timezone = cal_backend_get_cached_timezone;
-       iface->list_timezones = cal_backend_list_cached_timezones;
+       iface->tzcache_add_timezone = cal_backend_add_cached_timezone;
+       iface->tzcache_get_timezone = cal_backend_get_cached_timezone;
+       iface->tzcache_list_timezones = cal_backend_list_cached_timezones;
 }
 
 static void
diff --git a/src/calendar/libedata-cal/e-cal-cache.c b/src/calendar/libedata-cal/e-cal-cache.c
index 8da1faf88..1ad04a00e 100644
--- a/src/calendar/libedata-cal/e-cal-cache.c
+++ b/src/calendar/libedata-cal/e-cal-cache.c
@@ -4520,9 +4520,9 @@ e_cal_cache_class_init (ECalCacheClass *klass)
 static void
 ecc_timezone_cache_init (ETimezoneCacheInterface *iface)
 {
-       iface->add_timezone = ecc_add_cached_timezone;
-       iface->get_timezone = ecc_get_cached_timezone;
-       iface->list_timezones = ecc_list_cached_timezones;
+       iface->tzcache_add_timezone = ecc_add_cached_timezone;
+       iface->tzcache_get_timezone = ecc_get_cached_timezone;
+       iface->tzcache_list_timezones = ecc_list_cached_timezones;
 }
 
 static void
diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
index 64ab34e20..aa9fe030d 100644
--- a/src/calendar/libedata-cal/e-cal-meta-backend.c
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
@@ -3489,12 +3489,12 @@ e_cal_meta_backend_init (ECalMetaBackend *meta_backend)
 static void
 e_cal_meta_backend_timezone_cache_init (ETimezoneCacheInterface *iface)
 {
-       ecmb_timezone_cache_parent_get_timezone = iface->get_timezone;
-       ecmb_timezone_cache_parent_list_timezones = iface->list_timezones;
+       ecmb_timezone_cache_parent_get_timezone = iface->tzcache_get_timezone;
+       ecmb_timezone_cache_parent_list_timezones = iface->tzcache_list_timezones;
 
-       /* leave the iface->add_timezone as it was, to have them in memory only */
-       iface->get_timezone = ecmb_get_cached_timezone;
-       iface->list_timezones = ecmb_list_cached_timezones;
+       /* leave the iface->tzcache_add_timezone as it was, to have them in memory only */
+       iface->tzcache_get_timezone = ecmb_get_cached_timezone;
+       iface->tzcache_list_timezones = ecmb_list_cached_timezones;
 }
 
 /**