[evolution/wip/mcrha/eds-libical-glib] Rename e_cal_util_i_cal_time_to_tm()/_with_zone() and e_cal_util_tm_to_i_cal_time() again
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/mcrha/eds-libical-glib] Rename e_cal_util_i_cal_time_to_tm()/_with_zone() and e_cal_util_tm_to_i_cal_time() again
- Date: Mon, 25 Mar 2019 16:12:39 +0000 (UTC)
commit 878115ff04baaef6f5d7e6664203efdb96d2ed5b
Author: Milan Crha <mcrha redhat com>
Date: Mon Mar 25 17:13:48 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/gui/comp-util.c | 2 +-
src/calendar/gui/e-alarm-list.c | 2 +-
src/calendar/gui/e-cal-component-preview.c | 2 +-
src/calendar/gui/e-cal-dialogs.c | 2 +-
src/calendar/gui/e-cal-list-view.c | 2 +-
src/calendar/gui/e-cal-model.c | 2 +-
src/calendar/gui/e-calendar-view.c | 6 +++---
src/calendar/gui/e-cell-date-edit-text.c | 4 ++--
src/calendar/gui/e-comp-editor-page-recurrence.c | 2 +-
src/calendar/gui/e-date-time-list.c | 2 +-
src/calendar/gui/e-day-view-time-item.c | 2 +-
src/calendar/gui/e-day-view-top-item.c | 2 +-
src/calendar/gui/e-memo-table.c | 6 +++---
src/calendar/gui/e-task-table.c | 6 +++---
src/calendar/gui/e-to-do-pane.c | 6 +++---
src/calendar/gui/itip-utils.c | 2 +-
src/calendar/importers/icalendar-importer.c | 4 ++--
src/e-util/e-timezone-dialog.c | 2 +-
src/modules/alarm-notify/alarm-notify.c | 2 +-
src/modules/calendar/e-cal-shell-view-private.c | 2 +-
src/modules/itip-formatter/itip-view.c | 4 ++--
src/plugins/save-calendar/csv-format.c | 2 +-
src/plugins/save-calendar/rdf-format.c | 2 +-
23 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/src/calendar/gui/comp-util.c b/src/calendar/gui/comp-util.c
index 00295acb0f..75676b929d 100644
--- a/src/calendar/gui/comp-util.c
+++ b/src/calendar/gui/comp-util.c
@@ -955,7 +955,7 @@ cal_comp_gdate_to_timet (const GDate *date,
g_date_to_struct_tm (date, &tm);
- tt = e_cal_util_tm_to_i_cal_time (&tm, TRUE);
+ tt = e_cal_util_tm_to_icaltime (&tm, TRUE);
if (with_zone)
res = i_cal_time_as_timet_with_zone (tt, (ICalTimezone *) with_zone);
else
diff --git a/src/calendar/gui/e-alarm-list.c b/src/calendar/gui/e-alarm-list.c
index 9ca111ee74..3b0d47c988 100644
--- a/src/calendar/gui/e-alarm-list.c
+++ b/src/calendar/gui/e-alarm-list.c
@@ -505,7 +505,7 @@ get_alarm_string (ECalComponentAlarm *alarm)
utc_zone = i_cal_timezone_get_utc_timezone ();
current_zone = calendar_config_get_icaltimezone ();
- tm = e_cal_util_i_cal_time_to_tm_with_zone (itt, utc_zone, current_zone);
+ tm = e_cal_util_icaltime_to_tm_with_zone (itt, utc_zone, current_zone);
e_time_format_date_and_time (&tm, calendar_config_get_24_hour_format (),
FALSE, FALSE, buf, sizeof (buf));
diff --git a/src/calendar/gui/e-cal-component-preview.c b/src/calendar/gui/e-cal-component-preview.c
index 39308ffb9f..eee4ae3e33 100644
--- a/src/calendar/gui/e-cal-component-preview.c
+++ b/src/calendar/gui/e-cal-component-preview.c
@@ -172,7 +172,7 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
if (zone != NULL)
i_cal_timezone_convert_time (itt, zone, default_zone);
- tm = e_cal_util_i_cal_time_to_tm (itt);
+ tm = e_cal_util_icaltime_to_tm (itt);
return e_datetime_format_format_tm ("calendar", "table", i_cal_time_is_date (itt) ? DTFormatKindDate
: DTFormatKindDateTime, &tm);
}
diff --git a/src/calendar/gui/e-cal-dialogs.c b/src/calendar/gui/e-cal-dialogs.c
index e984edf055..933d6aa4ea 100644
--- a/src/calendar/gui/e-cal-dialogs.c
+++ b/src/calendar/gui/e-cal-dialogs.c
@@ -667,7 +667,7 @@ get_current_time (ECalendarItem *calitem,
tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, zone);
- tmp_tm = e_cal_util_i_cal_time_to_tm (tt);
+ tmp_tm = e_cal_util_icaltime_to_tm (tt);
g_clear_object (&tt);
diff --git a/src/calendar/gui/e-cal-list-view.c b/src/calendar/gui/e-cal-list-view.c
index 134f5978cb..73d8b58a82 100644
--- a/src/calendar/gui/e-cal-list-view.c
+++ b/src/calendar/gui/e-cal-list-view.c
@@ -141,7 +141,7 @@ get_current_time_cb (ECellDateEdit *ecde,
zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (cal_list_view));
tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, zone);
- tmp_tm = e_cal_util_i_cal_time_to_tm (tt);
+ tmp_tm = e_cal_util_icaltime_to_tm (tt);
g_clear_object (&tt);
diff --git a/src/calendar/gui/e-cal-model.c b/src/calendar/gui/e-cal-model.c
index 33ccf573f0..6ea645bc2e 100644
--- a/src/calendar/gui/e-cal-model.c
+++ b/src/calendar/gui/e-cal-model.c
@@ -3991,7 +3991,7 @@ e_cal_model_date_value_to_string (ECalModel *model,
return g_strdup ("");
/* We currently convert all the dates to the current timezone. */
- tmp_tm = e_cal_util_i_cal_time_to_tm_with_zone (e_cell_date_edit_value_get_time (dv),
e_cell_date_edit_value_get_zone (dv), priv->zone);
+ tmp_tm = e_cal_util_icaltime_to_tm_with_zone (e_cell_date_edit_value_get_time (dv),
e_cell_date_edit_value_get_zone (dv), priv->zone);
memset (buffer, 0, sizeof (buffer));
e_time_format_date_and_time (&tmp_tm, priv->use_24_hour_format,
diff --git a/src/calendar/gui/e-calendar-view.c b/src/calendar/gui/e-calendar-view.c
index 97c8946053..a1ebc1425b 100644
--- a/src/calendar/gui/e-calendar-view.c
+++ b/src/calendar/gui/e-calendar-view.c
@@ -1734,7 +1734,7 @@ get_label (ICalTime *tt,
{
struct tm tmp_tm;
- tmp_tm = e_cal_util_i_cal_time_to_tm_with_zone (tt, f_zone, t_zone);
+ tmp_tm = e_cal_util_icaltime_to_tm_with_zone (tt, f_zone, t_zone);
return e_datetime_format_format_tm ("calendar", "table", i_cal_time_is_date (tt) ? DTFormatKindDate :
DTFormatKindDateTime, &tmp_tm);
}
@@ -2326,12 +2326,12 @@ e_calendar_view_get_description_text (ECalendarView *cal_view)
zone = e_cal_model_get_timezone (cal_view->priv->model);
tt = i_cal_time_from_timet_with_zone (start_time, FALSE, zone);
- start_tm = e_cal_util_i_cal_time_to_tm (tt);
+ start_tm = e_cal_util_icaltime_to_tm (tt);
g_clear_object (&tt);
/* Subtract one from end_time so we don't get an extra day. */
tt = i_cal_time_from_timet_with_zone (end_time - 1, FALSE, zone);
- end_tm = e_cal_util_i_cal_time_to_tm (tt);
+ end_tm = e_cal_util_icaltime_to_tm (tt);
g_clear_object (&tt);
if (E_IS_MONTH_VIEW (cal_view) || E_IS_CAL_LIST_VIEW (cal_view)) {
diff --git a/src/calendar/gui/e-cell-date-edit-text.c b/src/calendar/gui/e-cell-date-edit-text.c
index 0fd8c73e9c..d4aac12a16 100644
--- a/src/calendar/gui/e-cell-date-edit-text.c
+++ b/src/calendar/gui/e-cell-date-edit-text.c
@@ -138,7 +138,7 @@ cell_date_edit_text_get_text (ECellText *cell,
* timezone, we convert it to the current timezone to display
* it in the table. If the user actually edits the value,
* it will be set to the current timezone. See set_value (). */
- tmp_tm = e_cal_util_i_cal_time_to_tm_with_zone (tt, e_cell_date_edit_value_get_zone (dv), timezone);
+ tmp_tm = e_cal_util_icaltime_to_tm_with_zone (tt, e_cell_date_edit_value_get_zone (dv), timezone);
res = e_datetime_format_format_tm (
"calendar", "table", i_cal_time_is_date (tt) ?
@@ -224,7 +224,7 @@ cell_date_edit_text_set_value (ECellText *cell,
ICalTime *tt;
ICalTimezone *zone;
- tt = e_cal_util_tm_to_i_cal_time (&tmp_tm, is_date);
+ tt = e_cal_util_tm_to_icaltime (&tmp_tm, is_date);
if (is_date) {
zone = NULL;
diff --git a/src/calendar/gui/e-comp-editor-page-recurrence.c
b/src/calendar/gui/e-comp-editor-page-recurrence.c
index 1b40dc720d..bdc72c4332 100644
--- a/src/calendar/gui/e-comp-editor-page-recurrence.c
+++ b/src/calendar/gui/e-comp-editor-page-recurrence.c
@@ -440,7 +440,7 @@ ecep_recurrence_get_current_time_cb (ECalendarItem *calitem,
today = icaltime_today ();
- return e_cal_util_i_cal_time_to_tm (&today);
+ return e_cal_util_icaltime_to_tm (&today);
}
static GtkWidget *
diff --git a/src/calendar/gui/e-date-time-list.c b/src/calendar/gui/e-date-time-list.c
index 719c25a1ab..33adfddb47 100644
--- a/src/calendar/gui/e-date-time-list.c
+++ b/src/calendar/gui/e-date-time-list.c
@@ -154,7 +154,7 @@ get_exception_string (EDateTimeList *date_time_list,
else
tt = g_object_ref (itt);
- tmp_tm = e_cal_util_i_cal_time_to_tm (tt);
+ tmp_tm = e_cal_util_icaltime_to_tm (tt);
e_time_format_date_and_time (
&tmp_tm, use_24_hour_format,
diff --git a/src/calendar/gui/e-day-view-time-item.c b/src/calendar/gui/e-day-view-time-item.c
index a7ced493fa..849b0c1958 100644
--- a/src/calendar/gui/e-day-view-time-item.c
+++ b/src/calendar/gui/e-day-view-time-item.c
@@ -377,7 +377,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
i_cal_time_adjust (tt, 1, 0, 0, 0);
}
- mn = e_cal_util_i_cal_time_to_tm (tt);
+ mn = e_cal_util_icaltime_to_tm (tt);
g_clear_object (&tt);
diff --git a/src/calendar/gui/e-day-view-top-item.c b/src/calendar/gui/e-day-view-top-item.c
index bc3b0c99d4..9e080166ec 100644
--- a/src/calendar/gui/e-day-view-top-item.c
+++ b/src/calendar/gui/e-day-view-top-item.c
@@ -841,7 +841,7 @@ e_day_view_top_item_get_day_label (EDayView *day_view,
day_start_tt = i_cal_time_from_timet_with_zone (
day_view->day_starts[day], FALSE, zone);
- day_start = e_cal_util_i_cal_time_to_tm (day_start_tt);
+ day_start = e_cal_util_icaltime_to_tm (day_start_tt);
g_clear_object (&day_start_tt);
if (day_view->date_format == E_DAY_VIEW_DATE_FULL)
diff --git a/src/calendar/gui/e-memo-table.c b/src/calendar/gui/e-memo-table.c
index c9f85f41a7..f42a824eac 100644
--- a/src/calendar/gui/e-memo-table.c
+++ b/src/calendar/gui/e-memo-table.c
@@ -130,7 +130,7 @@ memo_table_get_current_time (ECellDateEdit *ecde,
tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, zone);
/* Now copy it to the struct tm and return it. */
- tmp_tm = e_cal_util_i_cal_time_to_tm (tt);
+ tmp_tm = e_cal_util_icaltime_to_tm (tt);
g_clear_object (&tt);
@@ -526,7 +526,7 @@ memo_table_query_tooltip (GtkWidget *widget,
if (dtstart && e_cal_component_datetime_get_value (dtstart)) {
gchar *str;
- tmp_tm = e_cal_util_i_cal_time_to_tm_with_zone (e_cal_component_datetime_get_value (dtstart),
zone, default_zone);
+ tmp_tm = e_cal_util_icaltime_to_tm_with_zone (e_cal_component_datetime_get_value (dtstart),
zone, default_zone);
str = e_datetime_format_format_tm ("calendar", "table",
i_cal_time_is_date (e_cal_component_datetime_get_value (dtstart)) ? DTFormatKindDate
: DTFormatKindDateTime,
&tmp_tm);
@@ -543,7 +543,7 @@ memo_table_query_tooltip (GtkWidget *widget,
if (dtdue && e_cal_component_datetime_get_value (dtdue)) {
gchar *str;
- tmp_tm = e_cal_util_i_cal_time_to_tm_with_zone (e_cal_component_datetime_get_value (dtdue),
zone, default_zone);
+ tmp_tm = e_cal_util_icaltime_to_tm_with_zone (e_cal_component_datetime_get_value (dtdue),
zone, default_zone);
str = e_datetime_format_format_tm ("calendar", "table",
i_cal_time_is_date (e_cal_component_datetime_get_value (dtdue)) ? DTFormatKindDate :
DTFormatKindDateTime,
&tmp_tm);
diff --git a/src/calendar/gui/e-task-table.c b/src/calendar/gui/e-task-table.c
index 029f9463b0..b63b2b03cb 100644
--- a/src/calendar/gui/e-task-table.c
+++ b/src/calendar/gui/e-task-table.c
@@ -864,7 +864,7 @@ task_table_query_tooltip (GtkWidget *widget,
if (dtstart && e_cal_component_datetime_get_value (dtstart)) {
gchar *str;
- tmp_tm = e_cal_util_i_cal_time_to_tm_with_zone (e_cal_component_datetime_get_value (dtstart),
zone, default_zone);
+ tmp_tm = e_cal_util_icaltime_to_tm_with_zone (e_cal_component_datetime_get_value (dtstart),
zone, default_zone);
str = e_datetime_format_format_tm ("calendar", "table",
i_cal_time_is_date (e_cal_component_datetime_get_value (dtstart)) ? DTFormatKindDate
: DTFormatKindDateTime,
&tmp_tm);
@@ -880,7 +880,7 @@ task_table_query_tooltip (GtkWidget *widget,
if (dtdue && e_cal_component_datetime_get_value (dtdue)) {
gchar *str;
- tmp_tm = e_cal_util_i_cal_time_to_tm_with_zone (e_cal_component_datetime_get_value (dtdue),
zone, default_zone);
+ tmp_tm = e_cal_util_icaltime_to_tm_with_zone (e_cal_component_datetime_get_value (dtdue),
zone, default_zone);
str = e_datetime_format_format_tm ("calendar", "table",
i_cal_time_is_date (e_cal_component_datetime_get_value (dtdue)) ? DTFormatKindDate :
DTFormatKindDateTime,
&tmp_tm);
@@ -1821,7 +1821,7 @@ e_task_table_get_current_time (ECellDateEdit *ecde,
tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, zone);
- tmp_tm = e_cal_util_i_cal_time_to_tm (tt);
+ tmp_tm = e_cal_util_icaltime_to_tm (tt);
g_clear_object (&tt);
diff --git a/src/calendar/gui/e-to-do-pane.c b/src/calendar/gui/e-to-do-pane.c
index fe0f783317..73ebd22915 100644
--- a/src/calendar/gui/e-to-do-pane.c
+++ b/src/calendar/gui/e-to-do-pane.c
@@ -229,7 +229,7 @@ etdp_date_time_to_string (const ECalComponentDateTime *dt,
if (is_overdue) {
struct tm tm;
- tm = e_cal_util_i_cal_time_to_tm (*out_itt);
+ tm = e_cal_util_icaltime_to_tm (*out_itt);
res = e_datetime_format_format_tm ("calendar", "table", i_cal_time_is_date (*out_itt) ?
DTFormatKindDate : DTFormatKindDateTime, &tm);
} else {
@@ -297,7 +297,7 @@ etdp_format_date_time (ECalClient *client,
etdp_itt_to_zone (itt, tzid, client, default_zone);
- tm = e_cal_util_i_cal_time_to_tm (itt);
+ tm = e_cal_util_icaltime_to_tm (itt);
res = e_datetime_format_format_tm ("calendar", "table", i_cal_time_is_date (itt) ? DTFormatKindDate :
DTFormatKindDateTime, &tm);
@@ -1488,7 +1488,7 @@ etdp_check_time_changed (EToDoPane *to_do_pane,
gchar *markup;
guint date_mark;
- tm = e_cal_util_i_cal_time_to_tm (itt);
+ tm = e_cal_util_icaltime_to_tm (itt);
i_cal_time_adjust (itt, 1, 0, 0, 0);
diff --git a/src/calendar/gui/itip-utils.c b/src/calendar/gui/itip-utils.c
index e498161a35..dbbb155053 100644
--- a/src/calendar/gui/itip-utils.c
+++ b/src/calendar/gui/itip-utils.c
@@ -657,7 +657,7 @@ get_label (ICalTime *tt,
gchar buffer[1000];
struct tm tmp_tm;
- tmp_tm = e_cal_util_i_cal_time_to_tm (tt);
+ tmp_tm = e_cal_util_icaltime_to_tm (tt);
e_time_format_date_and_time (
&tmp_tm, use_24_hour_format, FALSE, FALSE, buffer, 1000);
diff --git a/src/calendar/importers/icalendar-importer.c b/src/calendar/importers/icalendar-importer.c
index d0082e21fa..e2a0670835 100644
--- a/src/calendar/importers/icalendar-importer.c
+++ b/src/calendar/importers/icalendar-importer.c
@@ -1211,9 +1211,9 @@ format_dt (const ECalComponentDateTime *dt,
}
if (i_cal_time_get_timezone (tt))
- tm = e_cal_util_i_cal_time_to_tm_with_zone (tt, i_cal_time_get_timezone (tt), users_zone);
+ tm = e_cal_util_icaltime_to_tm_with_zone (tt, i_cal_time_get_timezone (tt), users_zone);
else
- tm = e_cal_util_i_cal_time_to_tm (tt);
+ tm = e_cal_util_icaltime_to_tm (tt);
return e_datetime_format_format_tm ("calendar", "table", i_cal_time_is_date (tt) ? DTFormatKindDate :
DTFormatKindDateTime, &tm);
}
diff --git a/src/e-util/e-timezone-dialog.c b/src/e-util/e-timezone-dialog.c
index 92858e9e43..11dc9e8e2b 100644
--- a/src/e-util/e-timezone-dialog.c
+++ b/src/e-util/e-timezone-dialog.c
@@ -534,7 +534,7 @@ zone_display_name_with_offset (const ICalTimezone *zone)
time_t now = time (NULL);
gmtime_r ((const time_t *) &now, &local);
- tt = e_cal_util_tm_to_i_cal_time (&local, TRUE);
+ tt = e_cal_util_tm_to_icaltime (&local, TRUE);
offset = i_cal_timezone_get_utc_offset ((ICalTimezone *) zone, tt, NULL);
g_clear_object (&tt);
diff --git a/src/modules/alarm-notify/alarm-notify.c b/src/modules/alarm-notify/alarm-notify.c
index 281151d3ae..e3cdaba2ba 100644
--- a/src/modules/alarm-notify/alarm-notify.c
+++ b/src/modules/alarm-notify/alarm-notify.c
@@ -104,7 +104,7 @@ alarm_notify_module_format_time_cb (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);
text = e_datetime_format_format_tm ("calendar", "table", itt->is_date ? DTFormatKindDate :
DTFormatKindDateTime, &tm);
if (text) {
diff --git a/src/modules/calendar/e-cal-shell-view-private.c b/src/modules/calendar/e-cal-shell-view-private.c
index f7b22aadaa..06c5a2c47a 100644
--- a/src/modules/calendar/e-cal-shell-view-private.c
+++ b/src/modules/calendar/e-cal-shell-view-private.c
@@ -60,7 +60,7 @@ cal_shell_view_get_current_time (ECalendarItem *calitem,
tt = icaltime_from_timet_with_zone (time (NULL), FALSE, timezone);
- return e_cal_util_i_cal_time_to_tm (&tt);
+ return e_cal_util_icaltime_to_tm (&tt);
}
static void
diff --git a/src/modules/itip-formatter/itip-view.c b/src/modules/itip-formatter/itip-view.c
index 521b04674e..24e62cba44 100644
--- a/src/modules/itip-formatter/itip-view.c
+++ b/src/modules/itip-formatter/itip-view.c
@@ -6522,7 +6522,7 @@ itip_view_init_view (ItipView *view)
} else
from_zone = NULL;
- start_tm = e_cal_util_i_cal_time_to_tm_with_zone (datetime.value, from_zone, to_zone);
+ start_tm = e_cal_util_icaltime_to_tm_with_zone (datetime.value, from_zone, to_zone);
itip_view_set_start (view, &start_tm, datetime.value->is_date);
view->priv->start_time = icaltime_as_timet_with_zone (*datetime.value, from_zone);
@@ -6568,7 +6568,7 @@ itip_view_init_view (ItipView *view)
icaltime_adjust (datetime.value, -1, 0, 0, 0);
}
- end_tm = e_cal_util_i_cal_time_to_tm_with_zone (datetime.value, from_zone, to_zone);
+ end_tm = e_cal_util_icaltime_to_tm_with_zone (datetime.value, from_zone, to_zone);
itip_view_set_end (view, &end_tm, datetime.value->is_date);
view->priv->end_time = icaltime_as_timet_with_zone (*datetime.value, from_zone);
diff --git a/src/plugins/save-calendar/csv-format.c b/src/plugins/save-calendar/csv-format.c
index f255d5fb09..57b2013c63 100644
--- a/src/plugins/save-calendar/csv-format.c
+++ b/src/plugins/save-calendar/csv-format.c
@@ -149,7 +149,7 @@ add_time_to_csv (GString *line,
if (time) {
gboolean needquotes = FALSE;
- struct tm mytm = e_cal_util_i_cal_time_to_tm (time);
+ struct tm mytm = e_cal_util_icaltime_to_tm (time);
gchar *str = (gchar *) g_malloc (sizeof (gchar) * 200);
/* Translators: the %F %T is the third argument for a
diff --git a/src/plugins/save-calendar/rdf-format.c b/src/plugins/save-calendar/rdf-format.c
index 366969a2eb..3be32efe6e 100644
--- a/src/plugins/save-calendar/rdf-format.c
+++ b/src/plugins/save-calendar/rdf-format.c
@@ -133,7 +133,7 @@ add_time_to_rdf (xmlNodePtr node,
{
if (time) {
xmlNodePtr cur_node = NULL;
- struct tm mytm = e_cal_util_i_cal_time_to_tm (time);
+ struct tm mytm = e_cal_util_icaltime_to_tm (time);
gchar *str = (gchar *) g_malloc (sizeof (gchar) * 200);
gchar *tmp = NULL;
gchar *timezone;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]