[evolution-data-server/wip/mcrha/libical-glib] Rename e_cal_util_i_cal_time_to_tm()/_with_zone() and e_cal_util_tm_to_i_cal_time() again

[Milan Crha <mcrha src gnome org>]

commit dfa74131e628dd51cede884db8145fdfabd210d7
Author: Milan Crha <mcrha redhat com>
Date:   Mon Mar 25 17:09:31 2019 +0100

    Rename e_cal_util_i_cal_time_to_tm()/_with_zone() and e_cal_util_tm_to_i_cal_time() again

 src/calendar/libecal/e-cal-recur.c        |  2 +-
 src/calendar/libecal/e-cal-time-util.c    | 20 ++++++++++----------
 src/calendar/libecal/e-cal-time-util.h    |  6 +++---
 src/calendar/libecal/e-reminder-watcher.c |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
index 50acc2b75..1e7d81641 100644
--- a/src/calendar/libecal/e-cal-recur.c
+++ b/src/calendar/libecal/e-cal-recur.c
@@ -5676,7 +5676,7 @@ e_cal_recur_describe_recurrence (ICalComponent *icalcomp,
                        }
 
                        tt = i_cal_object_construct (I_CAL_TYPE_TIME, &rrule.until, NULL, FALSE, NULL);
-                       tm = e_cal_util_i_cal_time_to_tm (tt);
+                       tm = e_cal_util_icaltime_to_tm (tt);
                        g_clear_object (&tt);
 
                        e_time_format_date_and_time (&tm, FALSE, FALSE, FALSE, dt_str, 255);
diff --git a/src/calendar/libecal/e-cal-time-util.c b/src/calendar/libecal/e-cal-time-util.c
index c71c304f5..f89dbaf6e 100644
--- a/src/calendar/libecal/e-cal-time-util.c
+++ b/src/calendar/libecal/e-cal-time-util.c
@@ -714,7 +714,7 @@ time_from_isodate (const gchar *str)
 }
 
 /**
- * e_cal_util_i_cal_time_to_tm:
+ * e_cal_util_icaltime_to_tm:
  * @itt: An #ICalTime
  *
  * Converts an #ICalTime into a GLibc's struct tm.
@@ -725,7 +725,7 @@ time_from_isodate (const gchar *str)
  * Since: 2.22
  */
 struct tm
-e_cal_util_i_cal_time_to_tm (const ICalTime *itt)
+e_cal_util_icaltime_to_tm (const ICalTime *itt)
 {
        struct tm tm;
        ICalTime *tt = (ICalTime *) itt;
@@ -750,7 +750,7 @@ e_cal_util_i_cal_time_to_tm (const ICalTime *itt)
 }
 
 /**
- * e_cal_util_i_cal_time_to_tm_with_zone:
+ * e_cal_util_icaltime_to_tm_with_zone:
  * @itt: A time value.
  * @from_zone: Source timezone.
  * @to_zone: Destination timezone.
@@ -764,9 +764,9 @@ e_cal_util_i_cal_time_to_tm (const ICalTime *itt)
  * Since: 2.22
  **/
 struct tm
-e_cal_util_i_cal_time_to_tm_with_zone (const ICalTime *itt,
-                                      const ICalTimezone *from_zone,
-                                      const ICalTimezone *to_zone)
+e_cal_util_icaltime_to_tm_with_zone (const ICalTime *itt,
+                                    const ICalTimezone *from_zone,
+                                    const ICalTimezone *to_zone)
 {
        struct tm tm;
        ICalTime *itt_copy;
@@ -779,14 +779,14 @@ e_cal_util_i_cal_time_to_tm_with_zone (const ICalTime *itt,
        itt_copy = i_cal_time_new_clone (itt);
 
        i_cal_timezone_convert_time (itt_copy, (ICalTimezone *) from_zone, (ICalTimezone *) to_zone);
-       tm = e_cal_util_i_cal_time_to_tm (itt_copy);
+       tm = e_cal_util_icaltime_to_tm (itt_copy);
        g_object_unref (itt_copy);
 
        return tm;
 }
 
 /**
- * e_cal_util_tm_to_i_cal_time:
+ * e_cal_util_tm_to_icaltime:
  * @tm: A struct tm.
  * @is_date: Whether the given time is a date only or not.
  *
@@ -798,8 +798,8 @@ e_cal_util_i_cal_time_to_tm_with_zone (const ICalTime *itt,
  * Since: 2.22
  */
 ICalTime *
-e_cal_util_tm_to_i_cal_time (struct tm *tm,
-                            gboolean is_date)
+e_cal_util_tm_to_icaltime (struct tm *tm,
+                          gboolean is_date)
 {
        ICalTime *itt;
 
diff --git a/src/calendar/libecal/e-cal-time-util.h b/src/calendar/libecal/e-cal-time-util.h
index cd75cd2ac..8acb13061 100644
--- a/src/calendar/libecal/e-cal-time-util.h
+++ b/src/calendar/libecal/e-cal-time-util.h
@@ -150,13 +150,13 @@ void              time_to_gdate_with_zone (GDate *date,
  * struct tm manipulation
  **************************************************************************/
 
-struct tm      e_cal_util_i_cal_time_to_tm
+struct tm      e_cal_util_icaltime_to_tm
                                        (const ICalTime *itt);
-struct tm      e_cal_util_i_cal_time_to_tm_with_zone
+struct tm      e_cal_util_icaltime_to_tm_with_zone
                                        (const ICalTime *itt,
                                         const ICalTimezone *from_zone,
                                         const ICalTimezone *to_zone);
-ICalTime *     e_cal_util_tm_to_i_cal_time
+ICalTime *     e_cal_util_tm_to_icaltime
                                        (struct tm *tm,
                                         gboolean is_date);
 
diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
index 90d58e502..da90d2635 100644
--- a/src/calendar/libecal/e-reminder-watcher.c
+++ b/src/calendar/libecal/e-reminder-watcher.c
@@ -1206,7 +1206,7 @@ e_reminder_watcher_format_time_impl (EReminderWatcher *watcher,
        g_return_if_fail (*inout_buffer != NULL);
        g_return_if_fail (buffer_size > 0);
 
-       tm = e_cal_util_i_cal_time_to_tm (itt);
+       tm = e_cal_util_icaltime_to_tm (itt);
        e_time_format_date_and_time (&tm, FALSE, FALSE, FALSE, *inout_buffer, buffer_size);
 }