[evolution/wip/mcrha/eds-libical-glib] Adapt to the latest libical-glib API changes
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/mcrha/eds-libical-glib] Adapt to the latest libical-glib API changes
- Date: Thu, 2 May 2019 10:55:53 +0000 (UTC)
commit 4f9de31b2a73a90c05988dce278fdf833d10771c
Author: Milan Crha <mcrha redhat com>
Date: Thu May 2 12:57:21 2019 +0200
Adapt to the latest libical-glib API changes
src/calendar/gui/calendar-config.c | 2 +-
src/calendar/gui/comp-util.c | 32 ++++----
src/calendar/gui/e-cal-component-preview.c | 2 +-
src/calendar/gui/e-cal-data-model.c | 10 +--
src/calendar/gui/e-cal-dialogs.c | 10 +--
src/calendar/gui/e-cal-list-view.c | 4 +-
src/calendar/gui/e-cal-model-calendar.c | 10 +--
src/calendar/gui/e-cal-model-memos.c | 2 +-
src/calendar/gui/e-cal-model-tasks.c | 4 +-
src/calendar/gui/e-cal-model.c | 20 ++---
src/calendar/gui/e-cal-ops.c | 22 ++---
src/calendar/gui/e-calendar-view.c | 36 ++++-----
src/calendar/gui/e-cell-date-edit-text.c | 8 +-
src/calendar/gui/e-comp-editor-event.c | 2 +-
src/calendar/gui/e-comp-editor-page-attachments.c | 2 +-
src/calendar/gui/e-comp-editor-page-recurrence.c | 16 ++--
src/calendar/gui/e-comp-editor-page-reminders.c | 12 +--
src/calendar/gui/e-comp-editor-property-part.c | 10 +--
src/calendar/gui/e-comp-editor-property-parts.c | 2 +-
src/calendar/gui/e-comp-editor.c | 30 +++----
src/calendar/gui/e-date-time-list.c | 4 +-
src/calendar/gui/e-day-view-main-item.c | 10 +--
src/calendar/gui/e-day-view-time-item.c | 6 +-
src/calendar/gui/e-day-view-top-item.c | 4 +-
src/calendar/gui/e-day-view.c | 94 +++++++++++-----------
src/calendar/gui/e-meeting-store.c | 20 ++---
src/calendar/gui/e-memo-table.c | 10 +--
src/calendar/gui/e-send-options-utils.c | 6 +-
src/calendar/gui/e-task-table.c | 17 ++--
src/calendar/gui/e-to-do-pane.c | 20 ++---
src/calendar/gui/e-week-view-event-item.c | 2 +-
src/calendar/gui/e-week-view-main-item.c | 2 +-
src/calendar/gui/e-week-view.c | 40 ++++-----
src/calendar/gui/itip-utils.c | 24 +++---
src/calendar/gui/print.c | 20 ++---
src/calendar/gui/tag-calendar.c | 10 +--
src/calendar/importers/icalendar-importer.c | 8 +-
src/e-util/test-source-selector.c | 6 +-
src/modules/calendar/e-cal-attachment-handler.c | 6 +-
src/modules/calendar/e-cal-base-shell-backend.c | 4 +-
src/modules/calendar/e-cal-shell-content.c | 14 ++--
src/modules/calendar/e-cal-shell-view-actions.c | 24 +++---
src/modules/calendar/e-cal-shell-view-memopad.c | 4 +-
src/modules/calendar/e-cal-shell-view-private.c | 4 +-
src/modules/calendar/e-cal-shell-view-taskpad.c | 4 +-
src/modules/calendar/e-cal-shell-view.c | 2 +-
src/modules/calendar/e-memo-shell-content.c | 6 +-
src/modules/calendar/e-memo-shell-view-actions.c | 4 +-
src/modules/calendar/e-task-shell-content.c | 6 +-
src/modules/calendar/e-task-shell-view-actions.c | 4 +-
src/modules/calendar/e-task-shell-view.c | 2 +-
.../composer-to-meeting/e-meeting-to-composer.c | 2 +-
src/modules/itip-formatter/itip-view.c | 30 +++----
src/plugins/mail-to-task/mail-to-task.c | 6 +-
src/plugins/pst-import/pst-importer.c | 8 +-
src/plugins/publish-calendar/publish-format-fb.c | 4 +-
src/plugins/publish-calendar/publish-format-ical.c | 6 +-
src/plugins/save-calendar/ical-format.c | 6 +-
58 files changed, 342 insertions(+), 343 deletions(-)
---
diff --git a/src/calendar/gui/calendar-config.c b/src/calendar/gui/calendar-config.c
index d523d5f846..c21a915d2a 100644
--- a/src/calendar/gui/calendar-config.c
+++ b/src/calendar/gui/calendar-config.c
@@ -235,7 +235,7 @@ calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed)
/* Get the current time, and subtract the appropriate
* number of days/hours/minutes. */
zone = calendar_config_get_icaltimezone ();
- tt = i_cal_time_current_time_with_zone (zone);
+ tt = i_cal_time_new_current_with_zone (zone);
switch (units) {
case E_DURATION_DAYS:
diff --git a/src/calendar/gui/comp-util.c b/src/calendar/gui/comp-util.c
index dbda0f8c44..dd46876261 100644
--- a/src/calendar/gui/comp-util.c
+++ b/src/calendar/gui/comp-util.c
@@ -58,7 +58,7 @@ cal_comp_util_add_exdate (ECalComponent *comp,
exdates = e_cal_component_get_exdates (comp);
- cdt = e_cal_component_datetime_new_take (i_cal_time_from_timet_with_zone (t, FALSE, zone),
+ cdt = e_cal_component_datetime_new_take (i_cal_time_new_from_timet_with_zone (t, FALSE, zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
exdates = g_slist_append (exdates, cdt);
@@ -286,7 +286,7 @@ cal_comp_is_icalcomp_on_server_sync (ICalComponent *icomp,
if (!icomp || !client || !i_cal_component_get_uid (icomp))
return FALSE;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
if (!comp)
return FALSE;
@@ -349,7 +349,7 @@ cal_comp_event_new_with_defaults_sync (ECalClient *client,
e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY);
- duration = i_cal_duration_null_duration ();
+ duration = i_cal_duration_new_null_duration ();
i_cal_duration_set_is_neg (duration, TRUE);
switch (default_reminder_units) {
@@ -404,14 +404,14 @@ cal_comp_event_new_with_current_time_sync (ECalClient *client,
zone = calendar_config_get_icaltimezone ();
if (all_day) {
- itt = i_cal_time_from_timet_with_zone (time (NULL), 1, zone);
+ itt = i_cal_time_new_from_timet_with_zone (time (NULL), 1, zone);
dt = e_cal_component_datetime_new_take (itt, zone ? g_strdup (i_cal_timezone_get_tzid (zone))
: NULL);
e_cal_component_set_dtstart (comp, dt);
e_cal_component_set_dtend (comp, dt);
} else {
- itt = i_cal_time_current_time_with_zone (zone);
+ itt = i_cal_time_new_current_with_zone (zone);
i_cal_time_adjust (itt, 0, 1, -i_cal_time_get_minute (itt), -i_cal_time_get_second (itt));
dt = e_cal_component_datetime_new_take (itt, zone ? g_strdup (i_cal_timezone_get_tzid (zone))
: NULL);
@@ -511,7 +511,7 @@ cal_comp_update_time_by_active_window (ECalComponent *comp,
g_return_if_fail (e_calendar_view_get_visible_time_range (cal_view, &start, &end));
zone = e_cal_model_get_timezone (e_calendar_view_get_model (cal_view));
- itt = i_cal_time_from_timet_with_zone (start, FALSE, zone);
+ itt = i_cal_time_new_from_timet_with_zone (start, FALSE, zone);
icomp = e_cal_component_get_icalcomponent (comp);
prop = i_cal_component_get_first_property (icomp, I_CAL_DTSTART_PROPERTY);
@@ -689,7 +689,7 @@ datetime_to_zone (ECalClient *client,
to = NULL;
}
- i_cal_timezone_convert_time (e_cal_component_datetime_get_value (date), from, to);
+ i_cal_time_convert_timezone (e_cal_component_datetime_get_value (date), from, to);
e_cal_component_datetime_set_tzid (date, tzid);
}
@@ -873,7 +873,7 @@ cal_comp_get_instance_times (ECalClient *client,
if (!end_time || i_cal_time_is_null_time (end_time)) {
g_clear_object (&end_time);
- end_time = i_cal_time_new_clone (start_time);
+ end_time = i_cal_time_clone (start_time);
}
if (i_cal_time_get_timezone (start_time)) {
@@ -903,7 +903,7 @@ cal_comp_get_instance_times (ECalClient *client,
}
}
- *out_instance_start = i_cal_time_new_clone (start_time);
+ *out_instance_start = i_cal_time_clone (start_time);
i_cal_time_set_timezone (*out_instance_start, zone);
if (i_cal_time_get_timezone (end_time)) {
@@ -936,7 +936,7 @@ cal_comp_get_instance_times (ECalClient *client,
}
}
- *out_instance_end = i_cal_time_new_clone (end_time);
+ *out_instance_end = i_cal_time_clone (end_time);
i_cal_time_set_timezone (*out_instance_end, zone);
g_clear_object (&start_time);
@@ -1059,7 +1059,7 @@ cal_comp_transfer_item_to (ECalClient *src_client,
async_context = g_slice_new0 (AsyncContext);
async_context->src_client = g_object_ref (src_client);
- async_context->icomp_clone = i_cal_component_new_clone (icomp_vcal);
+ async_context->icomp_clone = i_cal_component_clone (icomp_vcal);
async_context->do_copy = do_copy;
simple = g_simple_async_result_new (
@@ -1206,7 +1206,7 @@ cal_comp_transfer_item_to_sync (ECalClient *src_client,
if (ecalcomps && !ecalcomps->next) {
/* only one component, no need for a vCalendar list */
comp = ecalcomps->data;
- icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent (comp));
+ icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
} else {
icomp = i_cal_component_new (I_CAL_VCALENDAR_COMPONENT);
for (eiter = ecalcomps; eiter; eiter = g_slist_next (eiter)) {
@@ -1214,13 +1214,13 @@ cal_comp_transfer_item_to_sync (ECalClient *src_client,
i_cal_component_take_component (
icomp,
- i_cal_component_new_clone (e_cal_component_get_icalcomponent
(comp)));
+ i_cal_component_clone (e_cal_component_get_icalcomponent
(comp)));
}
}
e_util_free_nullable_object_slist (ecalcomps);
} else {
- icomp = i_cal_component_new_clone (icomp_event);
+ icomp = i_cal_component_clone (icomp_event);
}
if (do_copy) {
@@ -1386,10 +1386,10 @@ cal_comp_util_compare_time_with_today (const ICalTime *time_tt)
return 0;
if (i_cal_time_is_date (tt)) {
- now_tt = i_cal_time_today ();
+ now_tt = i_cal_time_new_today ();
res = i_cal_time_compare_date_only (tt, now_tt);
} else {
- now_tt = i_cal_time_current_time_with_zone (i_cal_time_get_timezone (tt));
+ now_tt = i_cal_time_new_current_with_zone (i_cal_time_get_timezone (tt));
i_cal_time_set_timezone (now_tt, i_cal_time_get_timezone (tt));
res = i_cal_time_compare (tt, now_tt);
}
diff --git a/src/calendar/gui/e-cal-component-preview.c b/src/calendar/gui/e-cal-component-preview.c
index 17270d55a0..f760b9df42 100644
--- a/src/calendar/gui/e-cal-component-preview.c
+++ b/src/calendar/gui/e-cal-component-preview.c
@@ -173,7 +173,7 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
}
if (zone != NULL)
- i_cal_timezone_convert_time (itt, zone, default_zone);
+ i_cal_time_convert_timezone (itt, zone, default_zone);
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-data-model.c b/src/calendar/gui/e-cal-data-model.c
index 9e5dcdb222..00c2ee37f1 100644
--- a/src/calendar/gui/e-cal-data-model.c
+++ b/src/calendar/gui/e-cal-data-model.c
@@ -189,8 +189,8 @@ component_data_equal (ComponentData *comp_data1,
/* Maybe not so effective compare, but might be still more effective
than updating whole UI with false notifications */
- as_str1 = i_cal_component_as_ical_string_r (icomp1);
- as_str2 = i_cal_component_as_ical_string_r (icomp2);
+ as_str1 = i_cal_component_as_ical_string (icomp1);
+ as_str2 = i_cal_component_as_ical_string (icomp2);
equal = g_strcmp0 (as_str1, as_str2) == 0;
@@ -1119,7 +1119,7 @@ cal_data_model_instance_generated (ICalComponent *icomp,
g_clear_object (&prop);
}
- comp_copy = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ comp_copy = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
g_return_val_if_fail (comp_copy != NULL, FALSE);
tt = i_cal_component_get_dtstart (e_cal_component_get_icalcomponent (comp_copy));
@@ -1305,7 +1305,7 @@ cal_data_model_process_modified_or_added_objects (ECalClientView *view,
/* This component requires an expand of recurrences, which
will be done in a dedicated thread, thus remember it */
to_expand_recurrences = g_slist_prepend (to_expand_recurrences,
- i_cal_component_new_clone (icomp));
+ i_cal_component_clone (icomp));
} else {
/* Single or detached instance, the simple case */
ECalComponent *comp;
@@ -1317,7 +1317,7 @@ cal_data_model_process_modified_or_added_objects (ECalClientView *view,
i_cal_component_get_status (icomp) == I_CAL_STATUS_CANCELLED)
continue;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(icomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
if (!comp)
continue;
diff --git a/src/calendar/gui/e-cal-dialogs.c b/src/calendar/gui/e-cal-dialogs.c
index eaeef3a7c2..b32c8eb7b5 100644
--- a/src/calendar/gui/e-cal-dialogs.c
+++ b/src/calendar/gui/e-cal-dialogs.c
@@ -54,7 +54,7 @@ is_past_event (ECalComponent *comp)
res = i_cal_time_compare_date_only (
e_cal_component_datetime_get_value (end_date),
- i_cal_time_current_time_with_zone (i_cal_time_get_timezone
(e_cal_component_datetime_get_value (end_date)))) == -1;
+ i_cal_time_new_current_with_zone (i_cal_time_get_timezone (e_cal_component_datetime_get_value
(end_date)))) == -1;
e_cal_component_datetime_free (end_date);
@@ -631,7 +631,7 @@ ecal_event (ECalendarItem *calitem,
{
GoToDialog *dlg = user_data;
GDate start_date, end_date;
- ICalTime *tt = i_cal_time_null_time ();
+ ICalTime *tt = i_cal_time_new_null_time ();
ICalTimezone *timezone;
time_t et;
@@ -665,7 +665,7 @@ get_current_time (ECalendarItem *calitem,
/* Get the current timezone. */
zone = calendar_config_get_icaltimezone ();
- tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (time (NULL), FALSE, zone);
tmp_tm = e_cal_util_icaltime_to_tm (tt);
@@ -789,7 +789,7 @@ e_cal_dialogs_goto_run (GtkWindow *parent,
ICalTimezone *timezone;
timezone = e_cal_data_model_get_timezone (dlg->data_model);
- tt = i_cal_time_current_time_with_zone (timezone);
+ tt = i_cal_time_new_current_with_zone (timezone);
dlg->year_val = i_cal_time_get_year (tt);
dlg->month_val = i_cal_time_get_month (tt) - 1;
@@ -956,7 +956,7 @@ e_cal_dialogs_recur_icalcomp (ECalClient *client,
g_return_val_if_fail (icomp != NULL, FALSE);
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
if (!comp)
return FALSE;
diff --git a/src/calendar/gui/e-cal-list-view.c b/src/calendar/gui/e-cal-list-view.c
index ee90c72ccc..a01841aa20 100644
--- a/src/calendar/gui/e-cal-list-view.c
+++ b/src/calendar/gui/e-cal-list-view.c
@@ -139,7 +139,7 @@ get_current_time_cb (ECellDateEdit *ecde,
struct tm tmp_tm;
zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (cal_list_view));
- tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (time (NULL), FALSE, zone);
tmp_tm = e_cal_util_icaltime_to_tm (tt);
@@ -502,7 +502,7 @@ e_cal_list_view_get_selected_time_range (ECalendarView *cal_view,
return FALSE;
comp = e_cal_component_new ();
- e_cal_component_set_icalcomponent (comp, i_cal_component_new_clone
(event->comp_data->icalcomp));
+ e_cal_component_set_icalcomponent (comp, i_cal_component_clone (event->comp_data->icalcomp));
if (start_time) {
ECalComponentDateTime *dt;
diff --git a/src/calendar/gui/e-cal-model-calendar.c b/src/calendar/gui/e-cal-model-calendar.c
index cac1fe3fc0..fe0d768a0f 100644
--- a/src/calendar/gui/e-cal-model-calendar.c
+++ b/src/calendar/gui/e-cal-model-calendar.c
@@ -74,9 +74,9 @@ get_dtend (ECalModelCalendar *model,
g_clear_object (&prop);
if (got_zone) {
- tt_end = i_cal_time_from_timet_with_zone (comp_data->instance_end, is_date, zone);
+ tt_end = i_cal_time_new_from_timet_with_zone (comp_data->instance_end, is_date, zone);
} else {
- tt_end = i_cal_time_from_timet_with_zone (comp_data->instance_end, is_date,
model_zone);
+ tt_end = i_cal_time_new_from_timet_with_zone (comp_data->instance_end, is_date,
model_zone);
}
if (!i_cal_time_is_valid_time (tt_end) || i_cal_time_is_null_time (tt_end)) {
@@ -101,9 +101,9 @@ get_dtend (ECalModelCalendar *model,
g_clear_object (&tt_start);
if (got_start_zone) {
- tt_start = i_cal_time_from_timet_with_zone (comp_data->instance_start,
is_date, start_zone);
+ tt_start = i_cal_time_new_from_timet_with_zone (comp_data->instance_start,
is_date, start_zone);
} else {
- tt_start = i_cal_time_from_timet_with_zone (comp_data->instance_start,
is_date, model_zone);
+ tt_start = i_cal_time_new_from_timet_with_zone (comp_data->instance_start,
is_date, model_zone);
}
i_cal_time_adjust (tt_start, 1, 0, 0, 0);
@@ -329,7 +329,7 @@ cal_model_calendar_set_value_at (ETableModel *etm,
if (!comp_data)
return;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
if (!comp) {
return;
}
diff --git a/src/calendar/gui/e-cal-model-memos.c b/src/calendar/gui/e-cal-model-memos.c
index 7a19dce3d6..ce53e00987 100644
--- a/src/calendar/gui/e-cal-model-memos.c
+++ b/src/calendar/gui/e-cal-model-memos.c
@@ -74,7 +74,7 @@ cal_model_memos_fill_component_from_values (ECalModel *model,
if (!dtstart || i_cal_time_is_null_time (dtstart) || !i_cal_time_is_valid_time (dtstart)) {
g_clear_object (&dtstart);
- dtstart = i_cal_time_today ();
+ dtstart = i_cal_time_new_today ();
i_cal_component_set_dtstart (comp_data->icalcomp, dtstart);
}
diff --git a/src/calendar/gui/e-cal-model-tasks.c b/src/calendar/gui/e-cal-model-tasks.c
index 4f01a83a31..8cc5c09ecc 100644
--- a/src/calendar/gui/e-cal-model-tasks.c
+++ b/src/calendar/gui/e-cal-model-tasks.c
@@ -392,7 +392,7 @@ get_due_status (ECalModelTasks *model,
if (i_cal_time_is_date (due_tt)) {
gint cmp;
- now_tt = i_cal_time_current_time_with_zone (e_cal_model_get_timezone (E_CAL_MODEL
(model)));
+ now_tt = i_cal_time_new_current_with_zone (e_cal_model_get_timezone (E_CAL_MODEL
(model)));
cmp = i_cal_time_compare_date_only (due_tt, now_tt);
g_object_unref (now_tt);
@@ -429,7 +429,7 @@ get_due_status (ECalModelTasks *model,
return E_CAL_MODEL_TASKS_DUE_FUTURE;
}
- now_tt = i_cal_time_current_time_with_zone (zone);
+ now_tt = i_cal_time_new_current_with_zone (zone);
if (i_cal_time_compare (due_tt, now_tt) <= 0)
res = E_CAL_MODEL_TASKS_DUE_OVERDUE;
diff --git a/src/calendar/gui/e-cal-model.c b/src/calendar/gui/e-cal-model.c
index d8d4cfdbdf..3c7a293924 100644
--- a/src/calendar/gui/e-cal-model.c
+++ b/src/calendar/gui/e-cal-model.c
@@ -363,10 +363,10 @@ get_dtstart (ECalModel *model,
if (got_zone) {
g_clear_object (&tt_start);
- tt_start = i_cal_time_from_timet_with_zone (comp_data->instance_start,
is_date, zone);
+ tt_start = i_cal_time_new_from_timet_with_zone (comp_data->instance_start,
is_date, zone);
} else if (priv->zone) {
g_clear_object (&tt_start);
- tt_start = i_cal_time_from_timet_with_zone (comp_data->instance_start,
is_date, priv->zone);
+ tt_start = i_cal_time_new_from_timet_with_zone (comp_data->instance_start,
is_date, priv->zone);
}
}
@@ -407,7 +407,7 @@ get_datetime_from_utc (ECalModel *model,
/* these are always in UTC, thus convert to default zone, if any and done */
if (priv->zone)
- i_cal_timezone_convert_time (tt_value, i_cal_timezone_get_utc_timezone (),
priv->zone);
+ i_cal_time_convert_timezone (tt_value, i_cal_timezone_get_utc_timezone (),
priv->zone);
g_object_unref (prop);
@@ -591,7 +591,7 @@ datetime_to_zone (ECalClient *client,
to = NULL;
}
- i_cal_timezone_convert_time (tt, from, to);
+ i_cal_time_convert_timezone (tt, from, to);
}
static void
@@ -1440,7 +1440,7 @@ cal_model_create_component_from_values_thread (EAlertSinkThreadJobData *job_data
if (tt > 0) {
/* Store Memo DTSTART as date, not as date-time */
- ICalTime *itt = i_cal_time_from_timet_with_zone (tt,
+ ICalTime *itt = i_cal_time_new_from_timet_with_zone (tt,
i_cal_component_isa (comp_data->icalcomp) ==
I_CAL_VJOURNAL_COMPONENT, e_cal_model_get_timezone (ccd->model));
prop = i_cal_component_get_first_property (comp_data->icalcomp,
I_CAL_DTSTART_PROPERTY);
@@ -1604,7 +1604,7 @@ cal_model_value_at (ETableModel *etm,
ECalComponent *comp;
gint retval = 0;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
if (comp) {
if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_JOURNAL) {
g_object_unref (comp);
@@ -1749,7 +1749,7 @@ cal_model_duplicate_value (ETableModel *etm,
case E_CAL_MODEL_FIELD_CANCELLED:
return (gpointer) value;
case E_CAL_MODEL_FIELD_COMPONENT :
- return i_cal_component_new_clone ((ICalComponent *) value);
+ return i_cal_component_clone ((ICalComponent *) value);
case E_CAL_MODEL_FIELD_DTSTART :
case E_CAL_MODEL_FIELD_CREATED :
case E_CAL_MODEL_FIELD_LASTMODIFIED :
@@ -1971,7 +1971,7 @@ cal_model_data_subscriber_component_added_or_modified (ECalDataModelSubscriber *
return;
table_model = E_TABLE_MODEL (model);
- icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent (comp));
+ icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
if (index < 0) {
e_table_model_pre_change (table_model);
@@ -3770,7 +3770,7 @@ e_cal_model_create_component_with_defaults_sync (ECalModel *model,
}
if (comp) {
- icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent (comp));
+ icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
g_object_unref (comp);
} else {
icomp = i_cal_component_new (model->priv->kind);
@@ -4099,7 +4099,7 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data,
* just make start_time = end_time so that end_time
* will be a valid date
*/
- end_time = i_cal_time_new_clone (start_time);
+ end_time = i_cal_time_clone (start_time);
i_cal_time_adjust (end_time, 1, 0, 0, 0);
i_cal_component_set_dtend (comp_data->icalcomp, end_time);
} else if (i_cal_time_is_date (start_time) && i_cal_time_is_date (end_time) &&
diff --git a/src/calendar/gui/e-cal-ops.c b/src/calendar/gui/e-cal-ops.c
index 7b8bf79f7f..1949d37a5c 100644
--- a/src/calendar/gui/e-cal-ops.c
+++ b/src/calendar/gui/e-cal-ops.c
@@ -54,7 +54,7 @@ cal_ops_manage_send_component (ECalModel *model,
if ((send_flags & E_CAL_OPS_SEND_FLAG_DONT_SEND) != 0)
return;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
if (!comp)
return;
@@ -204,7 +204,7 @@ e_cal_ops_create_component (ECalModel *model,
bod = g_new0 (BasicOperationData, 1);
bod->model = g_object_ref (model);
bod->client = g_object_ref (client);
- bod->icomp = i_cal_component_new_clone (icomp);
+ bod->icomp = i_cal_component_clone (icomp);
bod->create_cb = callback;
bod->user_data = user_data;
bod->user_data_free = user_data_free;
@@ -249,7 +249,7 @@ cal_ops_modify_component_thread (EAlertSinkThreadJobData *job_data,
if (bod->mod == E_CAL_OBJ_MOD_ALL) {
ECalComponent *comp;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (bod->icomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (bod->icomp));
if (comp && e_cal_component_has_recurrences (comp)) {
if (!comp_util_sanitize_recurrence_master_sync (comp, bod->client, cancellable,
error)) {
g_object_unref (comp);
@@ -257,7 +257,7 @@ cal_ops_modify_component_thread (EAlertSinkThreadJobData *job_data,
}
g_clear_object (&bod->icomp);
- bod->icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent (comp));
+ bod->icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
}
g_clear_object (&comp);
@@ -324,7 +324,7 @@ e_cal_ops_modify_component (ECalModel *model,
bod = g_new0 (BasicOperationData, 1);
bod->model = g_object_ref (model);
bod->client = g_object_ref (client);
- bod->icomp = i_cal_component_new_clone (icomp);
+ bod->icomp = i_cal_component_clone (icomp);
bod->mod = mod;
bod->send_flags = send_flags;
bod->is_modify = TRUE;
@@ -542,7 +542,7 @@ cal_ops_create_comp_with_new_uid_sync (ECalClient *cal_client,
g_return_val_if_fail (E_IS_CAL_CLIENT (cal_client), FALSE);
g_return_val_if_fail (I_CAL_IS_COMPONENT (icomp), FALSE);
- clone = i_cal_component_new_clone (icomp);
+ clone = i_cal_component_clone (icomp);
uid = e_util_generate_uid ();
i_cal_component_set_uid (clone, uid);
@@ -862,7 +862,7 @@ e_cal_ops_send_component (ECalModel *model,
scd = g_new0 (SendComponentData, 1);
scd->client = g_object_ref (client);
- scd->icomp = i_cal_component_new_clone (icomp);
+ scd->icomp = i_cal_component_clone (icomp);
source = e_client_get_source (E_CLIENT (client));
data_model = e_cal_model_get_data_model (model);
@@ -1473,7 +1473,7 @@ new_component_data_free (gpointer ptr)
else
zone = calendar_config_get_icaltimezone ();
- itt = i_cal_time_from_timet_with_zone (ncd->dtstart, FALSE, zone);
+ itt = i_cal_time_new_from_timet_with_zone (ncd->dtstart, FALSE, zone);
if (ncd->all_day) {
i_cal_time_set_time (itt, 0, 0, 0);
i_cal_time_set_is_date (itt, TRUE);
@@ -1484,7 +1484,7 @@ new_component_data_free (gpointer ptr)
e_cal_component_set_dtstart (ncd->comp, dt);
e_cal_component_datetime_free (dt);
- itt = i_cal_time_from_timet_with_zone (ncd->dtend, FALSE, zone);
+ itt = i_cal_time_new_from_timet_with_zone (ncd->dtend, FALSE, zone);
if (ncd->all_day) {
/* We round it up to the end of the day, unless it is
* already set to midnight */
@@ -1862,7 +1862,7 @@ e_cal_ops_open_component_in_editor_sync (ECalModel *model,
return;
}
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
g_return_if_fail (comp != NULL);
ncd = g_new0 (NewComponentData, 1);
@@ -2099,7 +2099,7 @@ e_cal_ops_transfer_components (EShellView *shell_view,
icomps = g_slist_copy (icomps);
for (link = icomps; link; link = g_slist_next (link)) {
- link->data = i_cal_component_new_clone (link->data);
+ link->data = i_cal_component_clone (link->data);
}
g_hash_table_insert (tcd->icomps_by_source, g_object_ref (source), icomps);
diff --git a/src/calendar/gui/e-calendar-view.c b/src/calendar/gui/e-calendar-view.c
index 31664636bd..b354700e4f 100644
--- a/src/calendar/gui/e-calendar-view.c
+++ b/src/calendar/gui/e-calendar-view.c
@@ -173,7 +173,7 @@ calendar_view_delete_event (ECalendarView *cal_view,
registry = e_cal_model_get_registry (model);
comp = e_cal_component_new ();
- e_cal_component_set_icalcomponent (comp, i_cal_component_new_clone (event->comp_data->icalcomp));
+ e_cal_component_set_icalcomponent (comp, i_cal_component_clone (event->comp_data->icalcomp));
vtype = e_cal_component_get_vtype (comp);
/*FIXME remove it once the we dont set the recurrence id for all the generated instances */
@@ -264,7 +264,7 @@ calendar_view_delete_event (ECalendarView *cal_view,
e_cal_component_datetime_free (dt);
- instance_rid = i_cal_time_from_timet_with_zone (
+ instance_rid = i_cal_time_new_from_timet_with_zone (
event->comp_data->instance_start,
TRUE, zone ? zone : i_cal_timezone_get_utc_timezone ());
e_cal_util_remove_instances (event->comp_data->icalcomp, instance_rid,
E_CAL_OBJ_MOD_THIS);
@@ -569,7 +569,7 @@ add_related_timezones (ICalComponent *des_icomp,
vtz_comp = i_cal_timezone_get_component (zone);
if (vtz_comp) {
- i_cal_component_take_component (des_icomp,
i_cal_component_new_clone (vtz_comp));
+ i_cal_component_take_component (des_icomp,
i_cal_component_clone (vtz_comp));
g_object_unref (vtz_comp);
}
}
@@ -628,13 +628,13 @@ calendar_view_copy_clipboard (ESelectable *selectable)
if (!is_comp_data_valid (event))
continue;
- new_icomp = i_cal_component_new_clone (event->comp_data->icalcomp);
+ new_icomp = i_cal_component_clone (event->comp_data->icalcomp);
/* do not remove RECURRENCE-IDs from copied objects */
i_cal_component_take_component (vcal_comp, new_icomp);
}
- comp_str = i_cal_component_as_ical_string_r (vcal_comp);
+ comp_str = i_cal_component_as_ical_string (vcal_comp);
/* copy the VCALENDAR to the clipboard */
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
@@ -659,7 +659,7 @@ calendar_view_component_created_cb (ECalModel *model,
ESourceRegistry *registry;
GtkWidget *toplevel = user_data;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (original_icomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (original_icomp));
g_return_if_fail (comp != NULL);
registry = e_cal_model_get_registry (model);
@@ -705,7 +705,7 @@ e_calendar_view_add_event_sync (ECalModel *model,
tt_start = i_cal_time_as_timet (old_dtstart);
old_dtend = i_cal_component_get_dtend (icomp);
tt_end = i_cal_time_as_timet (old_dtend);
- ic_dur = i_cal_duration_from_int (tt_end - tt_start);
+ ic_dur = i_cal_duration_new_from_int (tt_end - tt_start);
if (i_cal_duration_as_int (ic_dur) > 60 * 60 * 24) {
/* This is a long event */
@@ -713,7 +713,7 @@ e_calendar_view_add_event_sync (ECalModel *model,
end_offset = i_cal_time_get_hour (old_dtstart) * 60 + i_cal_time_get_minute (old_dtend);
}
- ic_oneday = i_cal_duration_null_duration ();
+ ic_oneday = i_cal_duration_new_null_duration ();
i_cal_duration_set_days (ic_oneday, 1);
old_dtstart_zone = i_cal_time_get_timezone (old_dtstart);
@@ -730,7 +730,7 @@ e_calendar_view_add_event_sync (ECalModel *model,
} else if (i_cal_duration_as_int (ic_dur) >= 60 * 60 * 24 && !all_day) {
g_clear_object (&ic_dur);
/* copy & paste from top canvas to main canvas */
- ic_dur = i_cal_duration_from_int (time_division * 60);
+ ic_dur = i_cal_duration_new_from_int (time_division * 60);
}
if (all_day)
@@ -743,7 +743,7 @@ e_calendar_view_add_event_sync (ECalModel *model,
all_day_event = TRUE;
new_dtstart = dtstart;
} else {
- ICalTime *new_time = i_cal_time_from_timet_with_zone (dtstart, FALSE, default_zone);
+ ICalTime *new_time = i_cal_time_new_from_timet_with_zone (dtstart, FALSE,
default_zone);
i_cal_time_set_hour (new_time, i_cal_time_get_hour (old_dtstart));
i_cal_time_set_minute (new_time, i_cal_time_get_minute (old_dtstart));
@@ -755,7 +755,7 @@ e_calendar_view_add_event_sync (ECalModel *model,
}
}
- itime = i_cal_time_from_timet_with_zone (new_dtstart, FALSE, old_dtstart_zone);
+ itime = i_cal_time_new_from_timet_with_zone (new_dtstart, FALSE, old_dtstart_zone);
/* set the timezone properly */
i_cal_time_set_timezone (itime, old_dtstart_zone);
if (all_day_event)
@@ -777,7 +777,7 @@ e_calendar_view_add_event_sync (ECalModel *model,
/* The new uid stuff can go away once we actually set it in the backend */
uid = e_util_generate_uid ();
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
e_cal_component_set_uid (comp, uid);
g_free (uid);
@@ -831,7 +831,7 @@ paste_clipboard_data_free (gpointer ptr)
g_free (found->data);
pcd->copied_uids = g_slist_delete_link (pcd->copied_uids, found);
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone
(comp_data->icalcomp));
if (itip_has_any_attendees (comp) &&
(itip_organizer_is_user (registry, comp, comp_data->client) ||
@@ -971,7 +971,7 @@ cal_view_paste_clipboard_thread (EAlertSinkThreadJobData *job_data,
ICalTimezone *zone;
zone = i_cal_timezone_new ();
- i_cal_timezone_set_component (zone, i_cal_component_new_clone (subcomp));
+ i_cal_timezone_set_component (zone, i_cal_component_clone (subcomp));
if (!e_cal_client_add_timezone_sync (client, zone, cancellable, error)) {
g_object_unref (subcomp);
@@ -1681,7 +1681,7 @@ e_calendar_view_edit_appointment (ECalendarView *cal_view,
if ((mode == EDIT_EVENT_AUTODETECT && e_cal_util_component_has_attendee (icomp))
|| mode == EDIT_EVENT_FORCE_MEETING) {
- ECalComponent *comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(icomp));
+ ECalComponent *comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
flags |= E_COMP_EDITOR_FLAG_WITH_ATTENDEES;
if (itip_organizer_is_user (registry, comp, client) ||
itip_sentby_is_user (registry, comp, client) ||
@@ -1849,7 +1849,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
client = pevent->comp_data->client;
- newcomp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(pevent->comp_data->icalcomp));
+ newcomp = e_cal_component_new_from_icalcomponent (i_cal_component_clone
(pevent->comp_data->icalcomp));
if (!newcomp) {
g_warning ("couldn't update calendar component with modified data from backend\n");
return FALSE;
@@ -2323,12 +2323,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);
+ tt = i_cal_time_new_from_timet_with_zone (start_time, FALSE, zone);
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);
+ tt = i_cal_time_new_from_timet_with_zone (end_time - 1, FALSE, zone);
end_tm = e_cal_util_icaltime_to_tm (tt);
g_clear_object (&tt);
diff --git a/src/calendar/gui/e-cell-date-edit-text.c b/src/calendar/gui/e-cell-date-edit-text.c
index d4aac12a16..fdc6cb2990 100644
--- a/src/calendar/gui/e-cell-date-edit-text.c
+++ b/src/calendar/gui/e-cell-date-edit-text.c
@@ -378,8 +378,8 @@ e_cell_date_edit_compare_cb (gconstpointer a,
}
/* Copy the 2nd value and convert it to the same timezone as the first. */
- tt = i_cal_time_new_clone (e_cell_date_edit_value_get_time (dv2));
- i_cal_timezone_convert_time (tt, e_cell_date_edit_value_get_zone (dv2),
e_cell_date_edit_value_get_zone (dv1));
+ tt = i_cal_time_clone (e_cell_date_edit_value_get_time (dv2));
+ i_cal_time_convert_timezone (tt, e_cell_date_edit_value_get_zone (dv2),
e_cell_date_edit_value_get_zone (dv1));
/* Now we can compare them. */
res = i_cal_time_compare (e_cell_date_edit_value_get_time (dv1), tt);
@@ -402,7 +402,7 @@ e_cell_date_edit_value_new (const ICalTime *tt,
if (zone)
g_return_val_if_fail (I_CAL_IS_TIMEZONE (zone), NULL);
- return e_cell_date_edit_value_new_take (i_cal_time_new_clone (tt),
+ return e_cell_date_edit_value_new_take (i_cal_time_clone (tt),
zone ? e_cal_util_copy_timezone (zone) : NULL);
}
@@ -457,7 +457,7 @@ e_cell_date_edit_value_set_time (ECellDateEditValue *value,
g_return_if_fail (value != NULL);
g_return_if_fail (I_CAL_IS_TIME (tt));
- e_cell_date_edit_value_take_time (value, i_cal_time_new_clone (tt));
+ e_cell_date_edit_value_take_time (value, i_cal_time_clone (tt));
}
void
diff --git a/src/calendar/gui/e-comp-editor-event.c b/src/calendar/gui/e-comp-editor-event.c
index 2dbe27ef43..bc0f245e79 100644
--- a/src/calendar/gui/e-comp-editor-event.c
+++ b/src/calendar/gui/e-comp-editor-event.c
@@ -400,7 +400,7 @@ ece_event_fill_widgets (ECompEditor *comp_editor,
if (dtstart && i_cal_time_is_valid_time (dtstart) && !i_cal_time_is_null_time (dtstart) &&
(!dtend || !i_cal_time_is_valid_time (dtend) || i_cal_time_is_null_time (dtend))) {
g_clear_object (&dtend);
- dtend = i_cal_time_new_clone (dtstart);
+ dtend = i_cal_time_clone (dtstart);
if (i_cal_time_is_date (dtstart))
i_cal_time_adjust (dtend, 1, 0, 0, 0);
}
diff --git a/src/calendar/gui/e-comp-editor-page-attachments.c
b/src/calendar/gui/e-comp-editor-page-attachments.c
index c371bf3a72..ace3e4a030 100644
--- a/src/calendar/gui/e-comp-editor-page-attachments.c
+++ b/src/calendar/gui/e-comp-editor-page-attachments.c
@@ -301,7 +301,7 @@ ecep_attachments_fill_widgets (ECompEditorPage *page,
gchar *temporary_filename = NULL;
ICalParameter *encoding_par = i_cal_property_get_first_parameter (prop,
I_CAL_ENCODING_PARAMETER);
if (encoding_par) {
- gchar *str_value = i_cal_property_get_value_as_string_r (prop);
+ gchar *str_value = i_cal_property_get_value_as_string (prop);
if (str_value) {
ICalParameterEncoding encoding = i_cal_parameter_get_encoding
(encoding_par);
diff --git a/src/calendar/gui/e-comp-editor-page-recurrence.c
b/src/calendar/gui/e-comp-editor-page-recurrence.c
index aacbe60eb9..579617a6aa 100644
--- a/src/calendar/gui/e-comp-editor-page-recurrence.c
+++ b/src/calendar/gui/e-comp-editor-page-recurrence.c
@@ -182,7 +182,7 @@ ecep_recurrence_update_preview (ECompEditorPageRecurrence *page_recurrence)
return;
}
- icomp = i_cal_component_new_clone ((ICalComponent *) editing_comp);
+ icomp = i_cal_component_clone ((ICalComponent *) editing_comp);
e_comp_editor_set_updating (comp_editor, TRUE);
e_comp_editor_fill_component (comp_editor, icomp);
@@ -331,7 +331,7 @@ ecep_recurrence_exceptions_add_clicked_cb (GtkButton *button,
gint year, month, day;
if (e_date_edit_get_date (E_DATE_EDIT (date_edit), &year, &month, &day)) {
- ICalTime *itt = i_cal_time_null_time ();
+ ICalTime *itt = i_cal_time_new_null_time ();
/* We use DATE values for exceptions, so we don't need a TZID. */
i_cal_time_set_timezone (itt, NULL);
@@ -374,7 +374,7 @@ ecep_recurrence_exceptions_edit_clicked_cb (GtkButton *button,
gint year, month, day;
if (e_date_edit_get_date (E_DATE_EDIT (date_edit), &year, &month, &day)) {
- ICalTime *itt = i_cal_time_null_time ();
+ ICalTime *itt = i_cal_time_new_null_time ();
/* We use DATE values for exceptions, so we don't need a TZID. */
i_cal_time_set_timezone (itt, NULL);
@@ -448,7 +448,7 @@ ecep_recurrence_get_current_time_cb (ECalendarItem *calitem,
ICalTime *today;
struct tm tm;
- today = i_cal_time_today ();
+ today = i_cal_time_new_today ();
tm = e_cal_util_icaltime_to_tm (today);
@@ -1105,7 +1105,7 @@ ecep_recurrence_fill_ending_date (ECompEditorPageRecurrence *page_recurrence,
to_zone = dtstart ? i_cal_time_get_timezone (dtstart) : NULL;
if (to_zone)
- i_cal_timezone_convert_time (until, from_zone, to_zone);
+ i_cal_time_convert_timezone (until, from_zone, to_zone);
i_cal_time_set_time (until, 0, 0, 0);
i_cal_time_set_is_date (until, TRUE);
@@ -1209,7 +1209,7 @@ ecep_recurrence_clear_widgets (ECompEditorPageRecurrence *page_recurrence)
g_signal_handlers_unblock_matched (page_recurrence->priv->recr_interval_unit_combo,
G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, page_recurrence);
g_clear_object (&page_recurrence->priv->ending_date_tt);
- page_recurrence->priv->ending_date_tt = i_cal_time_today ();
+ page_recurrence->priv->ending_date_tt = i_cal_time_new_today ();
page_recurrence->priv->ending_count = 2;
g_signal_handlers_block_matched (page_recurrence->priv->recr_ending_combo, G_SIGNAL_MATCH_DATA, 0, 0,
NULL, NULL, page_recurrence);
@@ -1421,7 +1421,7 @@ ecep_recurrence_simple_recur_to_comp (ECompEditorPageRecurrence *page_recurrence
&year, &month, &day);
g_return_if_fail (date_set);
- until = i_cal_time_null_time ();
+ until = i_cal_time_new_null_time ();
i_cal_time_set_date (until, year, month, day);
i_cal_time_set_is_date (until, 1);
i_cal_recurrence_set_until (recur, until);
@@ -1934,7 +1934,7 @@ ecep_recurrence_fill_component (ECompEditorPage *page,
if (dtstart && i_cal_time_is_valid_time (dtstart)) {
ICalTime *tt;
- tt = i_cal_time_null_time ();
+ tt = i_cal_time_new_null_time ();
i_cal_time_set_timezone (tt, NULL);
i_cal_time_set_is_date (tt, TRUE);
i_cal_time_set_date (tt, year, month, day);
diff --git a/src/calendar/gui/e-comp-editor-page-reminders.c b/src/calendar/gui/e-comp-editor-page-reminders.c
index b46f85691b..b2778d3902 100644
--- a/src/calendar/gui/e-comp-editor-page-reminders.c
+++ b/src/calendar/gui/e-comp-editor-page-reminders.c
@@ -585,7 +585,7 @@ ecep_reminders_widgets_to_selected (ECompEditorPageReminders *page_reminders)
alarm = e_cal_component_alarm_new ();
- duration = i_cal_duration_null_duration ();
+ duration = i_cal_duration_new_null_duration ();
if (e_dialog_combo_box_get (page_reminders->priv->relative_time_combo, relative_map) == BEFORE)
i_cal_duration_set_is_neg (duration, TRUE);
@@ -625,7 +625,7 @@ ecep_reminders_widgets_to_selected (ECompEditorPageReminders *page_reminders)
/* Repeat stuff */
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page_reminders->priv->repeat_check))) {
- duration = i_cal_duration_null_duration ();
+ duration = i_cal_duration_new_null_duration ();
switch (e_dialog_combo_box_get (page_reminders->priv->repeat_unit_combo, duration_units_map))
{
case DUR_MINUTES:
@@ -850,7 +850,7 @@ ecep_reminders_alarms_combo_changed_cb (GtkComboBox *combo_box,
e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY);
- duration = i_cal_duration_null_duration ();
+ duration = i_cal_duration_new_null_duration ();
i_cal_duration_set_is_neg (duration, TRUE);
@@ -910,7 +910,7 @@ ecep_reminders_alarms_add_clicked_cb (GtkButton *button,
ecep_reminders_add_needs_description_property (alarm);
- duration = i_cal_duration_null_duration ();
+ duration = i_cal_duration_new_null_duration ();
i_cal_duration_set_is_neg (duration, TRUE);
i_cal_duration_set_minutes (duration, 15);
@@ -1417,7 +1417,7 @@ ecep_reminders_fill_widgets (ECompEditorPage *page,
g_object_unref (valarm);
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (component));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (component));
if (comp && e_cal_component_has_alarms (comp)) {
GSList *alarms, *link;
gint alarm_type = ALARM_NONE;
@@ -1475,7 +1475,7 @@ ecep_reminders_fill_component (ECompEditorPage *page,
if (!E_COMP_EDITOR_PAGE_CLASS (e_comp_editor_page_reminders_parent_class)->fill_component (page,
component))
return TRUE;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (component));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (component));
g_return_val_if_fail (comp != NULL, FALSE);
page_reminders = E_COMP_EDITOR_PAGE_REMINDERS (page);
diff --git a/src/calendar/gui/e-comp-editor-property-part.c b/src/calendar/gui/e-comp-editor-property-part.c
index 68ceeb8884..7e2da74a84 100644
--- a/src/calendar/gui/e-comp-editor-property-part.c
+++ b/src/calendar/gui/e-comp-editor-property-part.c
@@ -700,7 +700,7 @@ ecepp_datetime_fill_widget (ECompEditorPropertyPart *property_part,
}
if (!value)
- value = i_cal_time_null_time ();
+ value = i_cal_time_new_null_time ();
e_comp_editor_property_part_datetime_set_value (part_datetime, value);
@@ -910,7 +910,7 @@ e_comp_editor_property_part_datetime_set_value (ECompEditorPropertyPartDatetime
if (!e_date_edit_get_allow_no_date_set (date_edit) && (!value || i_cal_time_is_null_time (value) ||
!i_cal_time_is_valid_time (value))) {
- tmp_value = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+ tmp_value = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
value = tmp_value;
}
@@ -933,11 +933,11 @@ e_comp_editor_property_part_datetime_set_value (ECompEditorPropertyPartDatetime
g_strcmp0 (i_cal_timezone_get_tzid (editor_zone), i_cal_timezone_get_tzid
(zone)) != 0 &&
g_strcmp0 (i_cal_timezone_get_location (editor_zone),
i_cal_timezone_get_location (zone)) != 0) {
if (tmp_value != value) {
- tmp_value = i_cal_time_new_clone (value);
+ tmp_value = i_cal_time_clone (value);
value = tmp_value;
}
- i_cal_timezone_convert_time (tmp_value, zone, editor_zone);
+ i_cal_time_convert_timezone (tmp_value, zone, editor_zone);
i_cal_time_set_timezone (tmp_value, editor_zone);
}
}
@@ -966,7 +966,7 @@ e_comp_editor_property_part_datetime_get_value (ECompEditorPropertyPartDatetime
ETimezoneEntry *timezone_entry = NULL;
GtkWidget *edit_widget;
EDateEdit *date_edit;
- ICalTime *value = i_cal_time_null_time ();
+ ICalTime *value = i_cal_time_new_null_time ();
gint year, month, day;
g_return_val_if_fail (E_IS_COMP_EDITOR_PROPERTY_PART_DATETIME (part_datetime), value);
diff --git a/src/calendar/gui/e-comp-editor-property-parts.c b/src/calendar/gui/e-comp-editor-property-parts.c
index daa3976d93..f2b8f58376 100644
--- a/src/calendar/gui/e-comp-editor-property-parts.c
+++ b/src/calendar/gui/e-comp-editor-property-parts.c
@@ -1103,7 +1103,7 @@ e_comp_editor_property_part_completed_ensure_date_time (ICalTime *pvalue)
i_cal_time_set_timezone (pvalue, i_cal_timezone_get_utc_timezone ());
} else if (!i_cal_time_is_utc (pvalue)) {
/* Make sure the time is in UTC */
- i_cal_timezone_convert_time (pvalue, i_cal_time_get_timezone (pvalue),
i_cal_timezone_get_utc_timezone ());
+ i_cal_time_convert_timezone (pvalue, i_cal_time_get_timezone (pvalue),
i_cal_timezone_get_utc_timezone ());
i_cal_time_set_timezone (pvalue, i_cal_timezone_get_utc_timezone ());
}
}
diff --git a/src/calendar/gui/e-comp-editor.c b/src/calendar/gui/e-comp-editor.c
index c164d011b7..45df027afc 100644
--- a/src/calendar/gui/e-comp-editor.c
+++ b/src/calendar/gui/e-comp-editor.c
@@ -280,7 +280,7 @@ e_comp_editor_set_component (ECompEditor *comp_editor,
if (comp_editor->priv->component != component) {
g_clear_object (&comp_editor->priv->component);
- comp_editor->priv->component = i_cal_component_new_clone ((ICalComponent *) component);
+ comp_editor->priv->component = i_cal_component_clone ((ICalComponent *) component);
}
g_warn_if_fail (comp_editor->priv->component != NULL);
@@ -560,7 +560,7 @@ ece_save_component_done (gpointer ptr)
if (sd->object_created)
g_signal_emit (sd->comp_editor, signals[OBJECT_CREATED], 0, NULL);
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (sd->component));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (sd->component));
if (sd->comp_editor->priv->page_general) {
GSList *added_attendees;
@@ -848,7 +848,7 @@ ece_save_component_thread (EAlertSinkThreadJobData *job_data,
e_alert_sink_thread_job_set_alert_ident (job_data, modify_alert_ident);
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (sd->component));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (sd->component));
g_return_if_fail (comp != NULL);
has_recurrences = e_cal_util_component_has_recurrences (sd->component);
@@ -970,7 +970,7 @@ ece_save_component (ECompEditor *comp_editor,
sd->comp_editor = g_object_ref (comp_editor);
sd->source_client = comp_editor->priv->source_client ? g_object_ref
(comp_editor->priv->source_client) : NULL;
sd->target_client = g_object_ref (comp_editor->priv->target_client);
- sd->component = i_cal_component_new_clone (component);
+ sd->component = i_cal_component_clone (component);
sd->with_send = with_send;
sd->close_after_save = close_after_save;
sd->recur_mod = recur_mod;
@@ -1267,7 +1267,7 @@ e_comp_editor_save_and_close (ECompEditor *comp_editor,
g_return_if_fail (E_IS_COMP_EDITOR (comp_editor));
if (comp_editor->priv->component) {
- ICalComponent *component = i_cal_component_new_clone (comp_editor->priv->component);
+ ICalComponent *component = i_cal_component_clone (comp_editor->priv->component);
if (component && e_comp_editor_fill_component (comp_editor, component)) {
ece_save_component (comp_editor, component, TRUE, can_close);
g_clear_object (&component);
@@ -1338,7 +1338,7 @@ e_comp_editor_prompt_and_save_changes (ECompEditor *comp_editor,
return FALSE;
}
- component = i_cal_component_new_clone (comp_editor->priv->component);
+ component = i_cal_component_clone (comp_editor->priv->component);
if (!e_comp_editor_fill_component (comp_editor, component)) {
g_clear_object (&component);
return FALSE;
@@ -1391,7 +1391,7 @@ ece_print_or_preview (ECompEditor *comp_editor,
g_return_if_fail (E_IS_COMP_EDITOR (comp_editor));
g_return_if_fail (e_comp_editor_get_component (comp_editor) != NULL);
- component = i_cal_component_new_clone (e_comp_editor_get_component (comp_editor));
+ component = i_cal_component_clone (e_comp_editor_get_component (comp_editor));
if (!e_comp_editor_fill_component (comp_editor, component)) {
g_clear_object (&component);
return;
@@ -3197,10 +3197,10 @@ ece_check_start_before_end (ECompEditor *comp_editor,
end_zone = i_cal_time_get_timezone (end_tt);
/* Convert the end time to the same timezone as the start time. */
- end_tt_copy = i_cal_time_new_clone (end_tt);
+ end_tt_copy = i_cal_time_clone (end_tt);
if (start_zone && end_zone && start_zone != end_zone)
- i_cal_timezone_convert_time (end_tt_copy, end_zone, start_zone);
+ i_cal_time_convert_timezone (end_tt_copy, end_zone, start_zone);
/* Now check if the start time is after the end time. If it is,
* we need to modify one of the times. */
@@ -3214,16 +3214,16 @@ ece_check_start_before_end (ECompEditor *comp_editor,
i_cal_time_get_day (start_tt));
g_clear_object (&end_tt_copy);
- end_tt_copy = i_cal_time_new_clone (end_tt);
+ end_tt_copy = i_cal_time_clone (end_tt);
if (start_zone && end_zone && start_zone != end_zone)
- i_cal_timezone_convert_time (end_tt_copy, end_zone, start_zone);
+ i_cal_time_convert_timezone (end_tt_copy, end_zone, start_zone);
if (duration > 0)
i_cal_time_adjust (end_tt_copy, 0, 0, 0, -duration);
if (i_cal_time_compare (start_tt, end_tt_copy) >= 0) {
g_clear_object (&end_tt);
- end_tt = i_cal_time_new_clone (start_tt);
+ end_tt = i_cal_time_clone (start_tt);
if (duration >= 0) {
i_cal_time_adjust (end_tt, 0, 0, 0, duration);
@@ -3233,7 +3233,7 @@ ece_check_start_before_end (ECompEditor *comp_editor,
}
if (start_zone && end_zone && start_zone != end_zone)
- i_cal_timezone_convert_time (end_tt, start_zone, end_zone);
+ i_cal_time_convert_timezone (end_tt, start_zone, end_zone);
}
} else {
/* Try to switch only the date */
@@ -3244,7 +3244,7 @@ ece_check_start_before_end (ECompEditor *comp_editor,
if (i_cal_time_compare (start_tt, end_tt_copy) >= 0) {
g_clear_object (&start_tt);
- start_tt = i_cal_time_new_clone (end_tt);
+ start_tt = i_cal_time_clone (end_tt);
if (duration >= 0) {
i_cal_time_adjust (start_tt, 0, 0, 0, -duration);
@@ -3254,7 +3254,7 @@ ece_check_start_before_end (ECompEditor *comp_editor,
}
if (start_zone && end_zone && start_zone != end_zone)
- i_cal_timezone_convert_time (start_tt, end_zone, start_zone);
+ i_cal_time_convert_timezone (start_tt, end_zone, start_zone);
}
}
diff --git a/src/calendar/gui/e-date-time-list.c b/src/calendar/gui/e-date-time-list.c
index 33adfddb47..dd947ffa42 100644
--- a/src/calendar/gui/e-date-time-list.c
+++ b/src/calendar/gui/e-date-time-list.c
@@ -530,7 +530,7 @@ e_date_time_list_set_date_time (EDateTimeList *date_time_list,
itt_old = G_LIST (iter->user_data)->data;
g_clear_object (&itt_old);
- G_LIST (iter->user_data)->data = i_cal_time_new_clone (itt);
+ G_LIST (iter->user_data)->data = i_cal_time_clone (itt);
row_updated (date_time_list,
g_list_position (date_time_list->priv->list, G_LIST (iter->user_data)));
}
@@ -590,7 +590,7 @@ e_date_time_list_append (EDateTimeList *date_time_list,
g_return_if_fail (i_cal_time_is_valid_time ((ICalTime *) itt));
if (g_list_find_custom (date_time_list->priv->list, itt, (GCompareFunc) compare_datetime) == NULL) {
- date_time_list->priv->list = g_list_append (date_time_list->priv->list, i_cal_time_new_clone
(itt));
+ date_time_list->priv->list = g_list_append (date_time_list->priv->list, i_cal_time_clone
(itt));
row_added (date_time_list, g_list_length (date_time_list->priv->list) - 1);
}
diff --git a/src/calendar/gui/e-day-view-main-item.c b/src/calendar/gui/e-day-view-main-item.c
index 39e93634fe..962c94fa1e 100644
--- a/src/calendar/gui/e-day-view-main-item.c
+++ b/src/calendar/gui/e-day-view-main-item.c
@@ -601,7 +601,7 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item,
else if (bar_y2 < scroll_flag)
event->end_minute -= time_divisions;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp)
return;
@@ -1054,14 +1054,14 @@ day_view_main_item_draw (GnomeCanvasItem *canvas_item,
/* Paint the background colors. */
- today_tt = i_cal_time_from_timet_with_zone (
+ today_tt = i_cal_time_new_from_timet_with_zone (
time (NULL), FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
for (day = 0; day < days_shown; day++) {
GDateWeekday weekday;
- day_start_tt = i_cal_time_from_timet_with_zone (
+ day_start_tt = i_cal_time_new_from_timet_with_zone (
day_view->day_starts[day], FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
@@ -1283,10 +1283,10 @@ day_view_main_item_draw (GnomeCanvasItem *canvas_item,
gdk_cairo_set_source_color (cr, &mb_color);
zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view));
- time_now = i_cal_time_current_time_with_zone (zone);
+ time_now = i_cal_time_new_current_with_zone (zone);
for (day = 0; day < days_shown; day++) {
- day_start = i_cal_time_from_timet_with_zone (day_view->day_starts[day], FALSE, zone);
+ day_start = i_cal_time_new_from_timet_with_zone (day_view->day_starts[day], FALSE,
zone);
if (i_cal_time_compare_date_only (day_start, time_now) == 0) {
grid_x1 = day_view->day_offsets[day] - x + E_DAY_VIEW_BAR_WIDTH;
diff --git a/src/calendar/gui/e-day-view-time-item.c b/src/calendar/gui/e-day-view-time-item.c
index 849b0c1958..28be1eb729 100644
--- a/src/calendar/gui/e-day-view-time-item.c
+++ b/src/calendar/gui/e-day-view-time-item.c
@@ -358,7 +358,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
cal_zone = e_calendar_view_get_timezone (
E_CALENDAR_VIEW (day_view));
- tt = i_cal_time_from_timet_with_zone (
+ tt = i_cal_time_new_from_timet_with_zone (
day_view->day_starts[0], 0, cal_zone);
/* diff is number of minutes */
@@ -367,7 +367,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
g_clear_object (&tt);
- tt = i_cal_time_from_timet_with_zone (day_view->day_starts[0], 0, cal_zone);
+ tt = i_cal_time_new_from_timet_with_zone (day_view->day_starts[0], 0, cal_zone);
i_cal_time_set_is_date (tt, FALSE);
i_cal_time_set_timezone (tt, cal_zone);
i_cal_time_convert_to_zone_inplace (tt, use_zone);
@@ -435,7 +435,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
mb_color = day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE];
}
- time_now = i_cal_time_current_time_with_zone (
+ time_now = i_cal_time_new_current_with_zone (
e_calendar_view_get_timezone (
E_CALENDAR_VIEW (day_view)));
marcus_bains_y =
diff --git a/src/calendar/gui/e-day-view-top-item.c b/src/calendar/gui/e-day-view-top-item.c
index 9e080166ec..42bdb40846 100644
--- a/src/calendar/gui/e-day-view-top-item.c
+++ b/src/calendar/gui/e-day-view-top-item.c
@@ -178,7 +178,7 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item,
if (!is_comp_data_valid (event))
return;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp)
return;
@@ -839,7 +839,7 @@ e_day_view_top_item_get_day_label (EDayView *day_view,
view = E_CALENDAR_VIEW (day_view);
zone = e_calendar_view_get_timezone (view);
- day_start_tt = i_cal_time_from_timet_with_zone (
+ day_start_tt = i_cal_time_new_from_timet_with_zone (
day_view->day_starts[day], FALSE, zone);
day_start = e_cal_util_icaltime_to_tm (day_start_tt);
g_clear_object (&day_start_tt);
diff --git a/src/calendar/gui/e-day-view.c b/src/calendar/gui/e-day-view.c
index e0e9ed8797..c9a225c6b0 100644
--- a/src/calendar/gui/e-day-view.c
+++ b/src/calendar/gui/e-day-view.c
@@ -577,7 +577,7 @@ e_day_view_get_work_day_range_for_day (EDayView *day_view,
GDateWeekday weekday;
ICalTime *tt;
- tt = i_cal_time_from_timet_with_zone (day_view->day_starts[day], FALSE,
+ tt = i_cal_time_new_from_timet_with_zone (day_view->day_starts[day], FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
switch (i_cal_time_day_of_week (tt)) {
@@ -778,11 +778,11 @@ day_view_new_event_in_selected_range_cb (ECalModel *model,
zone = e_cal_model_get_timezone (model);
uid = i_cal_component_get_uid (default_component);
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (default_component));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (default_component));
g_return_if_fail (comp != NULL);
- start_tt = i_cal_time_from_timet_with_zone (ned->dtstart, FALSE, zone);
- end_tt = i_cal_time_from_timet_with_zone (ned->dtend, FALSE, zone);
+ start_tt = i_cal_time_new_from_timet_with_zone (ned->dtstart, FALSE, zone);
+ end_tt = i_cal_time_new_from_timet_with_zone (ned->dtend, FALSE, zone);
if (ned->in_top_canvas) {
use_tzid = NULL;
@@ -2639,7 +2639,7 @@ process_component (EDayView *day_view,
if (day_view->lower == 0 && day_view->upper == 0)
return;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
if (!comp) {
g_message (G_STRLOC ": Could not set ICalComponent on ECalComponent");
return;
@@ -2820,7 +2820,7 @@ timezone_changed_cb (ECalModel *cal_model,
/* Recalculate the new start of the first day. We just use exactly
* the same time, but with the new timezone. */
- tt = i_cal_time_from_timet_with_zone (
+ tt = i_cal_time_new_from_timet_with_zone (
day_view->lower, FALSE,
old_zone);
@@ -3293,7 +3293,7 @@ set_style_from_attendee (EDayViewEvent *event,
if (!is_comp_data_valid (event))
return;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp)
return;
@@ -3743,7 +3743,7 @@ e_day_view_find_work_week_start (EDayView *day_view,
if (offset > 0)
g_date_subtract_days (&date, offset);
- tt = i_cal_time_null_time ();
+ tt = i_cal_time_new_null_time ();
i_cal_time_set_date (tt,
g_date_get_year (&date),
@@ -3779,7 +3779,7 @@ e_day_view_recalc_day_starts (EDayView *day_view,
day_view->lower = start_time;
day_view->upper = day_view->day_starts[days_shown];
- tt = i_cal_time_from_timet_with_zone (day_view->day_starts[0], FALSE, e_calendar_view_get_timezone
(E_CALENDAR_VIEW (day_view)));
+ tt = i_cal_time_new_from_timet_with_zone (day_view->day_starts[0], FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
g_date_clear (&dt, 1);
g_date_set_dmy (&dt, i_cal_time_get_day (tt), i_cal_time_get_month (tt), i_cal_time_get_year (tt));
/* To Translators: the %d stands for a week number, it's value between 1 and 52/53 */
@@ -5434,7 +5434,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
/* We use a temporary copy of the comp since we don't want to
* change the original comp here. Otherwise we would not detect that
* the event's time had changed in the "update_event" callback. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp)
return;
@@ -5456,7 +5456,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
dt = day_view->day_starts[day_view->resize_start_row];
date = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone (dt, is_date, zone),
+ i_cal_time_new_from_timet_with_zone (dt, is_date, zone),
(zone && !is_date) ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
cal_comp_set_dtstart_with_oldzone (client, comp, date);
@@ -5473,7 +5473,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
dt = day_view->day_starts[day_view->resize_end_row + 1];
date = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone (dt, is_date, zone),
+ i_cal_time_new_from_timet_with_zone (dt, is_date, zone),
(zone && !is_date) ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
cal_comp_set_dtend_with_oldzone (client, comp, date);
@@ -5494,11 +5494,11 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
/* set the correct DTSTART/DTEND on the individual recurrence */
if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
e_cal_component_datetime_take_value (date,
- i_cal_time_from_timet_with_zone (event->comp_data->instance_end,
FALSE, zone));
+ i_cal_time_new_from_timet_with_zone (event->comp_data->instance_end,
FALSE, zone));
cal_comp_set_dtend_with_oldzone (client, comp, date);
} else {
e_cal_component_datetime_take_value (date,
- i_cal_time_from_timet_with_zone (event->comp_data->instance_start,
FALSE, zone));
+ i_cal_time_new_from_timet_with_zone
(event->comp_data->instance_start, FALSE, zone));
cal_comp_set_dtstart_with_oldzone (client, comp, date);
}
@@ -5566,7 +5566,7 @@ e_day_view_finish_resize (EDayView *day_view)
/* We use a temporary shallow copy of the ico since we don't want to
* change the original ico here. Otherwise we would not detect that
* the event's time had changed in the "update_event" callback. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp)
return;
@@ -5595,13 +5595,13 @@ e_day_view_finish_resize (EDayView *day_view)
if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row);
date = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone (dt, FALSE, zone),
+ i_cal_time_new_from_timet_with_zone (dt, FALSE, zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
cal_comp_set_dtstart_with_oldzone (client, comp, date);
} else {
dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1);
date = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone (dt, FALSE, zone),
+ i_cal_time_new_from_timet_with_zone (dt, FALSE, zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
cal_comp_set_dtend_with_oldzone (client, comp, date);
}
@@ -5631,11 +5631,11 @@ e_day_view_finish_resize (EDayView *day_view)
/* set the correct DTSTART/DTEND on the individual recurrence */
if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
e_cal_component_datetime_take_value (date,
- i_cal_time_from_timet_with_zone (event->comp_data->instance_end,
FALSE, zone));
+ i_cal_time_new_from_timet_with_zone (event->comp_data->instance_end,
FALSE, zone));
cal_comp_set_dtend_with_oldzone (client, comp, date);
} else {
e_cal_component_datetime_take_value (date,
- i_cal_time_from_timet_with_zone (event->comp_data->instance_start,
FALSE, zone));
+ i_cal_time_new_from_timet_with_zone
(event->comp_data->instance_start, FALSE, zone));
cal_comp_set_dtstart_with_oldzone (client, comp, date);
}
@@ -5778,8 +5778,8 @@ e_day_view_add_event (ESourceRegistry *registry,
g_return_if_fail (end > add_event_data->day_view->lower);
zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->day_view));
- start_tt = i_cal_time_from_timet_with_zone (start, FALSE, zone);
- end_tt = i_cal_time_from_timet_with_zone (end, FALSE, zone);
+ start_tt = i_cal_time_new_from_timet_with_zone (start, FALSE, zone);
+ end_tt = i_cal_time_new_from_timet_with_zone (end, FALSE, zone);
if (add_event_data->comp_data) {
event.comp_data = g_object_ref (add_event_data->comp_data);
@@ -5788,7 +5788,7 @@ e_day_view_add_event (ESourceRegistry *registry,
event.comp_data->is_new_component = TRUE;
event.comp_data->client = g_object_ref (client);
e_cal_component_abort_sequence (comp);
- event.comp_data->icalcomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent
(comp));
+ event.comp_data->icalcomp = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
}
event.start = start;
@@ -6026,7 +6026,7 @@ e_day_view_reshape_long_event (EDayView *day_view,
/* We don't show the icons while resizing, since we'd have to
* draw them on top of the resize rect. Nor when editing. */
num_icons = 0;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp)
return;
@@ -6178,7 +6178,7 @@ e_day_view_reshape_day_events (EDayView *day_view,
if (!is_comp_data_valid (event))
continue;
- current_comp_string = i_cal_component_as_ical_string_r (event->comp_data->icalcomp);
+ current_comp_string = i_cal_component_as_ical_string (event->comp_data->icalcomp);
if (day_view->last_edited_comp_string == NULL) {
g_free (current_comp_string);
continue;
@@ -6233,7 +6233,7 @@ e_day_view_reshape_day_event (EDayView *day_view,
|| day_view->resize_event_num != event_num)) {
ECalComponent *comp;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone
(event->comp_data->icalcomp));
if (comp) {
if (e_cal_component_has_alarms (comp))
num_icons++;
@@ -7652,8 +7652,8 @@ e_day_view_event_move (ECalendarView *cal_view,
return TRUE;
start_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_start_row);
end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);
- start_time = i_cal_time_from_timet_with_zone (start_dt, 0, NULL);
- end_time = i_cal_time_from_timet_with_zone (end_dt, 0, NULL);
+ start_time = i_cal_time_new_from_timet_with_zone (start_dt, 0, NULL);
+ end_time = i_cal_time_new_from_timet_with_zone (end_dt, 0, NULL);
i_cal_time_adjust (start_time, -1, 0, 0, 0);
i_cal_time_adjust (end_time, -1, 0, 0, 0);
start_dt = i_cal_time_as_timet (start_time);
@@ -7666,8 +7666,8 @@ e_day_view_event_move (ECalendarView *cal_view,
return TRUE;
start_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_start_row);
end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);
- start_time = i_cal_time_from_timet_with_zone (start_dt, 0, NULL);
- end_time = i_cal_time_from_timet_with_zone (end_dt, 0, NULL);
+ start_time = i_cal_time_new_from_timet_with_zone (start_dt, 0, NULL);
+ end_time = i_cal_time_new_from_timet_with_zone (end_dt, 0, NULL);
i_cal_time_adjust (start_time ,1,0,0,0);
i_cal_time_adjust (end_time ,1,0,0,0);
start_dt = i_cal_time_as_timet (start_time);
@@ -7720,7 +7720,7 @@ e_day_view_change_event_time (EDayView *day_view,
/* We use a temporary shallow copy of the ico since we don't want to
* change the original ico here. Otherwise we would not detect that
* the event's time had changed in the "update_event" callback. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (e_cal_component_has_attendees (comp) &&
!itip_organizer_is_user (registry, comp, client)) {
@@ -7731,12 +7731,12 @@ e_day_view_change_event_time (EDayView *day_view,
zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view));
date = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone (start_dt, FALSE, zone),
+ i_cal_time_new_from_timet_with_zone (start_dt, FALSE, zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
cal_comp_set_dtstart_with_oldzone (client, comp, date);
e_cal_component_datetime_take_value (date,
- i_cal_time_from_timet_with_zone (end_dt, FALSE, zone));
+ i_cal_time_new_from_timet_with_zone (end_dt, FALSE, zone));
cal_comp_set_dtend_with_oldzone (client, comp, date);
e_cal_component_datetime_free (date);
@@ -7966,7 +7966,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
NULL);
g_return_if_fail (text != NULL);
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (comp) {
g_free (text);
return;
@@ -8032,7 +8032,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
itt = e_cal_component_datetime_get_value (olddt);
dt = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone
(event->comp_data->instance_start,
+ i_cal_time_new_from_timet_with_zone
(event->comp_data->instance_start,
i_cal_time_is_date (itt),
i_cal_time_get_timezone (itt)),
g_strdup (e_cal_component_datetime_get_tzid (olddt)));
} else {
@@ -8043,7 +8043,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
itt = olddt ? e_cal_component_datetime_get_value (olddt) :
NULL;
dt = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone
(event->comp_data->instance_start,
+ i_cal_time_new_from_timet_with_zone
(event->comp_data->instance_start,
itt ? i_cal_time_is_date (itt) : FALSE, zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) :
NULL);
}
@@ -8061,7 +8061,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
itt = e_cal_component_datetime_get_value (olddt);
dt = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone
(event->comp_data->instance_end,
+ i_cal_time_new_from_timet_with_zone
(event->comp_data->instance_end,
i_cal_time_is_date (itt),
i_cal_time_get_timezone (itt)),
g_strdup (e_cal_component_datetime_get_tzid (olddt)));
} else {
@@ -8072,7 +8072,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
itt = olddt ? e_cal_component_datetime_get_value (olddt) :
NULL;
dt = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone
(event->comp_data->instance_end,
+ i_cal_time_new_from_timet_with_zone
(event->comp_data->instance_end,
itt ? i_cal_time_is_date (itt) : FALSE, zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) :
NULL);
}
@@ -8137,7 +8137,7 @@ e_day_view_convert_grid_position_to_time (EDayView *day_view,
return day_view->day_starts[col + 1];
/* Create an ICalTime and convert to a time_t. */
- tt = i_cal_time_from_timet_with_zone (
+ tt = i_cal_time_new_from_timet_with_zone (
day_view->day_starts[col],
FALSE, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
i_cal_time_set_hour (tt, minutes / 60);
@@ -8184,7 +8184,7 @@ e_day_view_convert_time_to_grid_position (EDayView *day_view,
/* To find the row we need to convert the time to an ICalTime,
* calculate the offset in minutes from the top of the display and
* divide it by the mins per row setting. */
- tt = i_cal_time_from_timet_with_zone (time, FALSE, e_calendar_view_get_timezone (E_CALENDAR_VIEW
(day_view)));
+ tt = i_cal_time_new_from_timet_with_zone (time, FALSE, e_calendar_view_get_timezone (E_CALENDAR_VIEW
(day_view)));
minutes = i_cal_time_get_hour (tt) * 60 + i_cal_time_get_minute (tt);
minutes -= day_view->first_hour_shown * 60 + day_view->first_minute_shown;
@@ -9133,9 +9133,9 @@ e_day_view_on_drag_data_get (GtkWidget *widget,
e_cal_util_add_timezones_from_component (
vcal, event->comp_data->icalcomp);
i_cal_component_take_component (
- vcal, i_cal_component_new_clone (event->comp_data->icalcomp));
+ vcal, i_cal_component_clone (event->comp_data->icalcomp));
- comp_str = i_cal_component_as_ical_string_r (vcal);
+ comp_str = i_cal_component_as_ical_string (vcal);
if (comp_str) {
ESource *source;
const gchar *source_uid;
@@ -9266,7 +9266,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
* Otherwise we would not detect that the event's time
* had changed in the "update_event" callback. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone
(event->comp_data->icalcomp));
if (!comp)
return;
@@ -9297,7 +9297,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view));
dt = day_view->day_starts[day] + start_offset * 60;
- itt = i_cal_time_from_timet_with_zone (dt, FALSE, zone);
+ itt = i_cal_time_new_from_timet_with_zone (dt, FALSE, zone);
if (all_day_event) {
i_cal_time_set_is_date (itt, TRUE);
date = e_cal_component_datetime_new_take (itt, NULL);
@@ -9312,7 +9312,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
dt = day_view->day_starts[day + num_days];
else
dt = day_view->day_starts[day + num_days - 1] + end_offset * 60;
- itt = i_cal_time_from_timet_with_zone (dt, FALSE, zone);
+ itt = i_cal_time_new_from_timet_with_zone (dt, FALSE, zone);
if (all_day_event) {
i_cal_time_set_is_date (itt, TRUE);
date = e_cal_component_datetime_new_take (itt, NULL);
@@ -9505,7 +9505,7 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget,
* don't want to change the original comp here.
* Otherwise we would not detect that the event's time
* had changed in the "update_event" callback. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone
(event->comp_data->icalcomp));
if (!comp)
return;
@@ -9533,14 +9533,14 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget,
dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset *
60;
date = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone (dt, FALSE, zone),
+ i_cal_time_new_from_timet_with_zone (dt, FALSE, zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
cal_comp_set_dtstart_with_oldzone (client, comp, date);
e_cal_component_datetime_free (date);
dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) -
end_offset * 60;
date = e_cal_component_datetime_new_take (
- i_cal_time_from_timet_with_zone (dt, FALSE, zone),
+ i_cal_time_new_from_timet_with_zone (dt, FALSE, zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
cal_comp_set_dtend_with_oldzone (client, comp, date);
e_cal_component_datetime_free (date);
diff --git a/src/calendar/gui/e-meeting-store.c b/src/calendar/gui/e-meeting-store.c
index 0df2eb15e1..f886101584 100644
--- a/src/calendar/gui/e-meeting-store.c
+++ b/src/calendar/gui/e-meeting-store.c
@@ -1345,7 +1345,7 @@ find_zone (ICalProperty *in_prop,
ICalTimezone *zone;
zone = i_cal_timezone_new ();
- clone = i_cal_component_new_clone (subcomp);
+ clone = i_cal_component_clone (subcomp);
i_cal_timezone_set_component (zone, clone);
g_clear_object (&next_subcomp);
@@ -1411,11 +1411,11 @@ process_free_busy_comp_get_xfb (ICalProperty *ip,
* nothing will happen (*summary and/or *location will be NULL)
*/
- tmp = i_cal_property_get_parameter_as_string_r (ip, E_MEETING_FREE_BUSY_XPROP_SUMMARY);
+ tmp = i_cal_property_get_parameter_as_string (ip, E_MEETING_FREE_BUSY_XPROP_SUMMARY);
*summary = e_meeting_xfb_utf8_string_new_from_ical (tmp, E_MEETING_FREE_BUSY_XPROP_MAXLEN);
g_free (tmp);
- tmp = i_cal_property_get_parameter_as_string_r (ip, E_MEETING_FREE_BUSY_XPROP_LOCATION);
+ tmp = i_cal_property_get_parameter_as_string (ip, E_MEETING_FREE_BUSY_XPROP_LOCATION);
*location = e_meeting_xfb_utf8_string_new_from_ical (tmp, E_MEETING_FREE_BUSY_XPROP_MAXLEN);
g_free (tmp);
}
@@ -1439,7 +1439,7 @@ process_free_busy_comp (EMeetingAttendee *attendee,
ds_zone = find_zone (ip, tz_top_level);
else
ds_zone = g_object_ref (i_cal_timezone_get_utc_timezone ());
- i_cal_timezone_convert_time (dtstart, ds_zone, zone);
+ i_cal_time_convert_timezone (dtstart, ds_zone, zone);
e_meeting_attendee_set_start_busy_range (
attendee,
@@ -1466,7 +1466,7 @@ process_free_busy_comp (EMeetingAttendee *attendee,
de_zone = find_zone (ip, tz_top_level);
else
de_zone = g_object_ref (i_cal_timezone_get_utc_timezone ());
- i_cal_timezone_convert_time (dtend, de_zone, zone);
+ i_cal_time_convert_timezone (dtend, de_zone, zone);
e_meeting_attendee_set_end_busy_range (
attendee,
@@ -1527,8 +1527,8 @@ process_free_busy_comp (EMeetingAttendee *attendee,
fbstart = i_cal_period_get_start (fb);
fbend = i_cal_period_get_end (fb);
- i_cal_timezone_convert_time (fbstart, utc_zone, zone);
- i_cal_timezone_convert_time (fbend, utc_zone, zone);
+ i_cal_time_convert_timezone (fbstart, utc_zone, zone);
+ i_cal_time_convert_timezone (fbend, utc_zone, zone);
/* Extract extended free/busy (XFB) information from
* the ICalProperty, if it carries such.
@@ -1596,7 +1596,7 @@ process_free_busy (EMeetingStoreQueueData *qdata,
next_subcomp = i_cal_comp_iter_next (iter);
i_cal_component_take_component (tz_top_level,
- i_cal_component_new_clone (subcomp));
+ i_cal_component_clone (subcomp));
g_object_unref (subcomp);
subcomp = next_subcomp;
@@ -1802,7 +1802,7 @@ refresh_busy_periods (gpointer data)
if (priv->client) {
ICalTime *itt;
- itt = i_cal_time_null_time ();
+ itt = i_cal_time_new_null_time ();
i_cal_time_set_date (itt,
g_date_get_year (&qdata->start.date),
g_date_get_month (&qdata->start.date),
@@ -1814,7 +1814,7 @@ refresh_busy_periods (gpointer data)
fbd->startt = i_cal_time_as_timet_with_zone (itt, priv->zone);
g_clear_object (&itt);
- itt = i_cal_time_null_time ();
+ itt = i_cal_time_new_null_time ();
i_cal_time_set_date (itt,
g_date_get_year (&qdata->end.date),
g_date_get_month (&qdata->end.date),
diff --git a/src/calendar/gui/e-memo-table.c b/src/calendar/gui/e-memo-table.c
index 133659437b..2355978aa8 100644
--- a/src/calendar/gui/e-memo-table.c
+++ b/src/calendar/gui/e-memo-table.c
@@ -127,7 +127,7 @@ memo_table_get_current_time (ECellDateEdit *ecde,
model = e_memo_table_get_model (memo_table);
zone = e_cal_model_get_timezone (model);
- tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (time (NULL), FALSE, zone);
/* Now copy it to the struct tm and return it. */
tmp_tm = e_cal_util_icaltime_to_tm (tt);
@@ -434,7 +434,7 @@ memo_table_query_tooltip (GtkWidget *widget,
if (!comp_data || !comp_data->icalcomp)
return FALSE;
- new_comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ new_comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
if (!new_comp)
return FALSE;
@@ -828,7 +828,7 @@ copy_row_cb (gint model_row,
memo_table->priv->tmp_vcal, comp_data->icalcomp);
/* Add the new component to the VCALENDAR component. */
- child = i_cal_component_new_clone (comp_data->icalcomp);
+ child = i_cal_component_clone (comp_data->icalcomp);
if (child)
i_cal_component_take_component (memo_table->priv->tmp_vcal, child);
}
@@ -847,7 +847,7 @@ memo_table_copy_clipboard (ESelectable *selectable)
e_table_selected_row_foreach (
E_TABLE (memo_table), copy_row_cb, memo_table);
- comp_str = i_cal_component_as_ical_string_r (memo_table->priv->tmp_vcal);
+ comp_str = i_cal_component_as_ical_string (memo_table->priv->tmp_vcal);
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
e_clipboard_set_calendar (clipboard, comp_str, -1);
@@ -966,7 +966,7 @@ memo_table_delete_selection (ESelectable *selectable)
if (comp_data) {
comp = e_cal_component_new_from_icalcomponent (
- i_cal_component_new_clone (comp_data->icalcomp));
+ i_cal_component_clone (comp_data->icalcomp));
}
if (e_cal_model_get_confirm_delete (model))
diff --git a/src/calendar/gui/e-send-options-utils.c b/src/calendar/gui/e-send-options-utils.c
index cf575ae474..c8ae310778 100644
--- a/src/calendar/gui/e-send-options-utils.c
+++ b/src/calendar/gui/e-send-options-utils.c
@@ -89,7 +89,7 @@ e_send_options_utils_set_default_data (ESendOptionsDialog *sod,
else {
ICalTime *itt;
- itt = i_cal_time_from_string (value);
+ itt = i_cal_time_new_from_string (value);
gopts->delay_enabled = TRUE;
gopts->delay_until = i_cal_time_as_timet (itt);
@@ -222,9 +222,9 @@ e_send_options_utils_fill_component (ESendOptionsDialog *sod,
ICalTime *temp;
gchar *str;
- temp = i_cal_time_from_timet_with_zone (gopts->delay_until, FALSE, zone);
+ temp = i_cal_time_new_from_timet_with_zone (gopts->delay_until, FALSE, zone);
- str = i_cal_time_as_ical_string_r (temp);
+ str = i_cal_time_as_ical_string (temp);
prop = i_cal_property_new_x (str);
g_free (str);
i_cal_property_set_x_name (prop, "X-EVOLUTION-OPTIONS-DELAY");
diff --git a/src/calendar/gui/e-task-table.c b/src/calendar/gui/e-task-table.c
index 50f344ef7c..167bf52a34 100644
--- a/src/calendar/gui/e-task-table.c
+++ b/src/calendar/gui/e-task-table.c
@@ -758,7 +758,7 @@ task_table_query_tooltip (GtkWidget *widget,
if (!comp_data || !comp_data->icalcomp)
return FALSE;
- new_comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ new_comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
if (!new_comp)
return FALSE;
@@ -1191,7 +1191,7 @@ copy_row_cb (gint model_row,
task_table->priv->tmp_vcal, comp_data->icalcomp);
/* Add the new component to the VCALENDAR component. */
- child = i_cal_component_new_clone (comp_data->icalcomp);
+ child = i_cal_component_clone (comp_data->icalcomp);
if (child) {
i_cal_component_take_component (task_table->priv->tmp_vcal, child);
}
@@ -1211,7 +1211,7 @@ task_table_copy_clipboard (ESelectable *selectable)
e_table_selected_row_foreach (
E_TABLE (task_table), copy_row_cb, task_table);
- comp_str = i_cal_component_as_ical_string_r (task_table->priv->tmp_vcal);
+ comp_str = i_cal_component_as_ical_string (task_table->priv->tmp_vcal);
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
e_clipboard_set_calendar (clipboard, comp_str, -1);
@@ -1391,7 +1391,7 @@ task_table_delete_selection (ESelectable *selectable)
if (comp_data) {
comp = e_cal_component_new_from_icalcomponent (
- i_cal_component_new_clone (comp_data->icalcomp));
+ i_cal_component_clone (comp_data->icalcomp));
}
if ((n_selected == 1) && comp && check_for_retract (comp, comp_data->client)) {
@@ -1704,7 +1704,7 @@ hide_completed_rows_ready (GObject *source_object,
ECalComponent *comp = e_cal_component_new ();
e_cal_component_set_icalcomponent (
- comp, i_cal_component_new_clone (m->data));
+ comp, i_cal_component_clone (m->data));
id = e_cal_component_get_id (comp);
comp_data = e_cal_model_get_component_for_client_and_uid (model, cal_client, id);
@@ -1775,7 +1775,7 @@ show_completed_rows_ready (GObject *source_object,
ECalComponent *comp = e_cal_component_new ();
e_cal_component_set_icalcomponent (
- comp, i_cal_component_new_clone (m->data));
+ comp, i_cal_component_clone (m->data));
id = e_cal_component_get_id (comp);
if (!(e_cal_model_get_component_for_client_and_uid (model, cal_client, id))) {
@@ -1783,8 +1783,7 @@ show_completed_rows_ready (GObject *source_object,
comp_data = g_object_new (
E_TYPE_CAL_MODEL_COMPONENT, NULL);
comp_data->client = g_object_ref (cal_client);
- comp_data->icalcomp =
- i_cal_component_new_clone (m->data);
+ comp_data->icalcomp = i_cal_component_clone (m->data);
e_cal_model_set_instance_times (
comp_data,
e_cal_model_get_timezone (model));
@@ -1823,7 +1822,7 @@ e_task_table_get_current_time (ECellDateEdit *ecde,
model = e_task_table_get_model (task_table);
zone = e_cal_model_get_timezone (model);
- tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (time (NULL), FALSE, zone);
tmp_tm = e_cal_util_icaltime_to_tm (tt);
diff --git a/src/calendar/gui/e-to-do-pane.c b/src/calendar/gui/e-to-do-pane.c
index b145bc8703..be8330daf0 100644
--- a/src/calendar/gui/e-to-do-pane.c
+++ b/src/calendar/gui/e-to-do-pane.c
@@ -199,7 +199,7 @@ etdp_itt_to_zone (ICalTime *itt,
}
if (zone)
- i_cal_timezone_convert_time (itt, zone, default_zone);
+ i_cal_time_convert_timezone (itt, zone, default_zone);
}
static gchar *
@@ -218,7 +218,7 @@ etdp_date_time_to_string (const ECalComponentDateTime *dt,
g_return_val_if_fail (e_cal_component_datetime_get_value (dt) != NULL, NULL);
g_return_val_if_fail (out_itt != NULL, NULL);
- *out_itt = i_cal_time_new_clone (e_cal_component_datetime_get_value (dt));
+ *out_itt = i_cal_time_clone (e_cal_component_datetime_get_value (dt));
etdp_itt_to_zone (*out_itt, e_cal_component_datetime_get_tzid (dt), client, default_zone);
@@ -294,7 +294,7 @@ etdp_format_date_time (ECalClient *client,
if (!in_itt)
return NULL;
- itt = i_cal_time_new_clone ((ICalTime *) in_itt);
+ itt = i_cal_time_clone ((ICalTime *) in_itt);
etdp_itt_to_zone (itt, tzid, client, default_zone);
@@ -407,7 +407,7 @@ etdp_get_component_data (EToDoPane *to_do_pane,
if (!dt || !e_cal_component_datetime_get_value (dt)) {
/* Fill the itt structure in case the task has no Due date */
- itt = i_cal_time_new_clone (e_cal_component_datetime_get_value (dtstart));
+ itt = i_cal_time_clone (e_cal_component_datetime_get_value (dtstart));
etdp_itt_to_zone (itt, e_cal_component_datetime_get_tzid (dtstart), client,
default_zone);
}
}
@@ -460,11 +460,11 @@ etdp_get_component_data (EToDoPane *to_do_pane,
dtend = e_cal_component_get_dtend (comp);
- ittstart = i_cal_time_new_clone (e_cal_component_datetime_get_value (dt));
+ ittstart = i_cal_time_clone (e_cal_component_datetime_get_value (dt));
if (dtend && e_cal_component_datetime_get_value (dtend))
- ittend = i_cal_time_new_clone (e_cal_component_datetime_get_value (dtend));
+ ittend = i_cal_time_clone (e_cal_component_datetime_get_value (dtend));
else
- ittend = i_cal_time_new_clone (ittstart);
+ ittend = i_cal_time_clone (ittstart);
etdp_itt_to_zone (ittstart, e_cal_component_datetime_get_tzid (dt), client,
default_zone);
etdp_itt_to_zone (ittend, (dtend && e_cal_component_datetime_get_value (dtend)) ?
@@ -868,7 +868,7 @@ etdp_get_comp_colors (EToDoPane *to_do_pane,
is_date = i_cal_time_is_date (itt);
etdp_itt_to_zone (itt, e_cal_component_datetime_get_tzid (dt), client, default_zone);
- now = i_cal_time_current_time_with_zone (default_zone);
+ now = i_cal_time_new_current_with_zone (default_zone);
if ((is_date && i_cal_time_compare_date_only (itt, now) < 0) ||
(!is_date && i_cal_time_compare (itt, now) <= 0)) {
@@ -1421,7 +1421,7 @@ etdp_check_time_changed (EToDoPane *to_do_pane,
g_return_if_fail (E_IS_TO_DO_PANE (to_do_pane));
zone = e_cal_data_model_get_timezone (to_do_pane->priv->events_data_model);
- itt = i_cal_time_current_time_with_zone (zone);
+ itt = i_cal_time_new_current_with_zone (zone);
new_today = etdp_create_date_mark (itt);
if (force_update || new_today != to_do_pane->priv->last_today) {
@@ -1856,7 +1856,7 @@ etdp_new_common (EToDoPane *to_do_pane,
time_divisions_secs = g_settings_get_int (settings, "time-divisions") * 60;
zone = e_cal_data_model_get_timezone (to_do_pane->priv->events_data_model);
- now = i_cal_time_current_time_with_zone (zone);
+ now = i_cal_time_new_current_with_zone (zone);
i_cal_time_set_year (now, date_mark / 10000);
i_cal_time_set_month (now, (date_mark / 100) % 100);
diff --git a/src/calendar/gui/e-week-view-event-item.c b/src/calendar/gui/e-week-view-event-item.c
index 4193a3b25e..5f26b46ba5 100644
--- a/src/calendar/gui/e-week-view-event-item.c
+++ b/src/calendar/gui/e-week-view-event-item.c
@@ -446,7 +446,7 @@ week_view_event_item_draw_icons (EWeekViewEventItem *event_item,
if (!is_comp_data_valid (event))
return;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp)
return;
diff --git a/src/calendar/gui/e-week-view-main-item.c b/src/calendar/gui/e-week-view-main-item.c
index 3c051766ca..22f1b770ab 100644
--- a/src/calendar/gui/e-week-view-main-item.c
+++ b/src/calendar/gui/e-week-view-main-item.c
@@ -101,7 +101,7 @@ week_view_main_item_draw_day (EWeekViewMainItem *main_item,
zone = e_calendar_view_get_timezone (view);
/* Check if we are drawing today */
- tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (time (NULL), FALSE, zone);
today = g_date_get_year (date) == i_cal_time_get_year (tt) &&
g_date_get_month (date) == i_cal_time_get_month (tt) &&
g_date_get_day (date) == i_cal_time_get_day (tt);
diff --git a/src/calendar/gui/e-week-view.c b/src/calendar/gui/e-week-view.c
index cfd3be0f5b..dd5e630946 100644
--- a/src/calendar/gui/e-week-view.c
+++ b/src/calendar/gui/e-week-view.c
@@ -219,7 +219,7 @@ week_view_process_component (EWeekView *week_view,
if (!g_date_valid (&week_view->priv->first_day_shown))
return;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
if (!comp) {
g_message (G_STRLOC ": Could not set ICalComponent on ECalComponent");
return;
@@ -533,7 +533,7 @@ timezone_changed_cb (ECalModel *cal_model,
if (!g_date_valid (first_day_shown))
return;
- tt = i_cal_time_null_time ();
+ tt = i_cal_time_new_null_time ();
/* Recalculate the new start of the first week. We just use exactly
* the same time, but with the new timezone. */
@@ -659,7 +659,7 @@ week_view_new_event_in_selected_range_cb (ECalModel *model,
goto exit;
/* Add a new event covering the selected range. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (default_component));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (default_component));
g_return_if_fail (comp != NULL);
uid = i_cal_component_get_uid (default_component);
@@ -669,11 +669,11 @@ week_view_new_event_in_selected_range_cb (ECalModel *model,
/* We use DATE values now, so we don't need the timezone. */
/*date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));*/
- date = e_cal_component_datetime_new_take (i_cal_time_from_timet_with_zone (ned->dtstart, TRUE, zone),
NULL);
+ date = e_cal_component_datetime_new_take (i_cal_time_new_from_timet_with_zone (ned->dtstart, TRUE,
zone), NULL);
e_cal_component_set_dtstart (comp, date);
e_cal_component_datetime_free (date);
- date = e_cal_component_datetime_new_take (i_cal_time_from_timet_with_zone (ned->dtend, TRUE, zone),
NULL);
+ date = e_cal_component_datetime_new_take (i_cal_time_new_from_timet_with_zone (ned->dtend, TRUE,
zone), NULL);
e_cal_component_set_dtend (comp, date);
e_cal_component_datetime_free (date);
@@ -2244,7 +2244,7 @@ e_week_view_set_first_day_shown (EWeekView *week_view,
week_view->priv->first_day_shown = base_date;
- start_tt = i_cal_time_null_time ();
+ start_tt = i_cal_time_new_null_time ();
i_cal_time_set_date (start_tt,
g_date_get_year (&base_date),
g_date_get_month (&base_date),
@@ -2662,7 +2662,7 @@ set_style_from_attendee (EWeekViewEvent *event,
if (!is_comp_data_valid (event))
return;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp)
return;
@@ -3353,10 +3353,10 @@ e_week_view_add_event (ECalClient *client,
if (end != start || end < add_event_data->week_view->day_starts[0])
g_return_if_fail (end > add_event_data->week_view->day_starts[0]);
- start_tt = i_cal_time_from_timet_with_zone (
+ start_tt = i_cal_time_new_from_timet_with_zone (
start, FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->week_view)));
- end_tt = i_cal_time_from_timet_with_zone (
+ end_tt = i_cal_time_new_from_timet_with_zone (
end, FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->week_view)));
@@ -3367,7 +3367,7 @@ e_week_view_add_event (ECalClient *client,
event.comp_data->is_new_component = TRUE;
event.comp_data->client = g_object_ref (client);
e_cal_component_abort_sequence (comp);
- event.comp_data->icalcomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent
(comp));
+ event.comp_data->icalcomp = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
}
event.start = start;
@@ -3492,7 +3492,7 @@ e_week_view_reshape_events (EWeekView *week_view)
week_view, event_num, span_num);
if (week_view->last_edited_comp_string == NULL)
continue;
- current_comp_string = i_cal_component_as_ical_string_r (event->comp_data->icalcomp);
+ current_comp_string = i_cal_component_as_ical_string (event->comp_data->icalcomp);
if (strncmp (current_comp_string, week_view->last_edited_comp_string, 50) == 0) {
EWeekViewEventSpan *span;
@@ -3768,7 +3768,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
span = &g_array_index (week_view->spans, EWeekViewEventSpan,
event->spans_index + span_num);
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp)
return;
@@ -4585,16 +4585,16 @@ e_week_view_change_event_time (EWeekView *week_view,
/* We use a temporary shallow copy of the ico since we don't want to
* change the original ico here. Otherwise we would not detect that
* the event's time had changed in the "update_event" callback. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view));
- date = e_cal_component_datetime_new_take (i_cal_time_from_timet_with_zone (start_dt, is_all_day,
zone),
+ date = e_cal_component_datetime_new_take (i_cal_time_new_from_timet_with_zone (start_dt, is_all_day,
zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
cal_comp_set_dtstart_with_oldzone (client, comp, date);
e_cal_component_datetime_free (date);
- date = e_cal_component_datetime_new_take (i_cal_time_from_timet_with_zone (end_dt, is_all_day, zone),
+ date = e_cal_component_datetime_new_take (i_cal_time_new_from_timet_with_zone (end_dt, is_all_day,
zone),
zone ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL);
cal_comp_set_dtend_with_oldzone (client, comp, date);
e_cal_component_datetime_free (date);
@@ -4734,7 +4734,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
g_object_set (span->text_item, "handle_popup", FALSE, NULL);
g_object_get (span->text_item, "text", &text, NULL);
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(event->comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (event->comp_data->icalcomp));
if (!comp) {
g_free (text);
g_object_notify (G_OBJECT (week_view), "is-editing");
@@ -4802,12 +4802,12 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
if (dt)
tt = e_cal_component_datetime_get_value (dt);
if (dt && tt && i_cal_time_get_timezone (tt)) {
- tt = i_cal_time_from_timet_with_zone (
+ tt = i_cal_time_new_from_timet_with_zone (
event->comp_data->instance_start,
i_cal_time_is_date (tt),
i_cal_time_get_timezone (tt));
} else {
- tt = i_cal_time_from_timet_with_zone (
+ tt = i_cal_time_new_from_timet_with_zone (
event->comp_data->instance_start,
(dt && tt) ? i_cal_time_is_date (tt) : FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW
(week_view)));
@@ -4823,12 +4823,12 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
if (dt)
tt = e_cal_component_datetime_get_value (dt);
if (dt && tt && i_cal_time_get_timezone (tt)) {
- tt = i_cal_time_from_timet_with_zone (
+ tt = i_cal_time_new_from_timet_with_zone (
event->comp_data->instance_end,
i_cal_time_is_date (tt),
i_cal_time_get_timezone (tt));
} else {
- tt = i_cal_time_from_timet_with_zone (
+ tt = i_cal_time_new_from_timet_with_zone (
event->comp_data->instance_end,
(dt && tt) ? i_cal_time_is_date (tt) : FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW
(week_view)));
diff --git a/src/calendar/gui/itip-utils.c b/src/calendar/gui/itip-utils.c
index 72783cc140..172342640e 100644
--- a/src/calendar/gui/itip-utils.c
+++ b/src/calendar/gui/itip-utils.c
@@ -703,7 +703,7 @@ foreach_tzid_callback (ICalParameter *param,
return;
i_cal_component_take_component (
- tz_data->icomp, i_cal_component_new_clone (vtimezone_comp));
+ tz_data->icomp, i_cal_component_clone (vtimezone_comp));
g_hash_table_insert (tz_data->tzids, g_strdup (tzid), GINT_TO_POINTER (1));
g_object_unref (vtimezone_comp);
}
@@ -731,7 +731,7 @@ comp_toplevel_with_zones (ECalComponentItipMethod method,
for (link = (GSList *) ecomps; link; link = g_slist_next (link)) {
icomp = e_cal_component_get_icalcomponent (link->data);
- icomp = i_cal_component_new_clone (icomp);
+ icomp = i_cal_component_clone (icomp);
i_cal_component_foreach_tzid (icomp, foreach_tzid_callback, &tz_data);
@@ -1368,7 +1368,7 @@ comp_limit_attendees (ESourceRegistry *registry,
continue;
}
- attendee = i_cal_property_get_value_as_string_r (prop);
+ attendee = i_cal_property_get_value_as_string (prop);
if (!attendee)
continue;
@@ -1532,7 +1532,7 @@ comp_minimal (ESourceRegistry *registry,
}
}
- itt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, i_cal_timezone_get_utc_timezone ());
+ itt = i_cal_time_new_from_timet_with_zone (time (NULL), FALSE, i_cal_timezone_get_utc_timezone ());
e_cal_component_set_dtstamp (clone, itt);
g_clear_object (&itt);
@@ -1572,7 +1572,7 @@ comp_minimal (ESourceRegistry *registry,
{
ICalProperty *p;
- p = i_cal_property_new_clone (prop);
+ p = i_cal_property_clone (prop);
i_cal_component_take_property (icomp_clone, p);
}
@@ -1626,7 +1626,7 @@ comp_compliant_one (ESourceRegistry *registry,
ICalTime *itt;
clone = e_cal_component_clone (comp);
- itt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, i_cal_timezone_get_utc_timezone ());
+ itt = i_cal_time_new_from_timet_with_zone (time (NULL), FALSE, i_cal_timezone_get_utc_timezone ());
e_cal_component_set_dtstamp (clone, itt);
g_clear_object (&itt);
@@ -1671,7 +1671,7 @@ comp_compliant_one (ESourceRegistry *registry,
i_cal_time_get_second (dtvalue));
i_cal_time_set_is_date (itt, FALSE);
- i_cal_timezone_convert_time (itt, from_zone, to_zone);
+ i_cal_time_convert_timezone (itt, from_zone, to_zone);
i_cal_time_set_timezone (itt, to_zone);
i_cal_recurrence_set_until (rt, itt);
@@ -2211,7 +2211,7 @@ itip_send_component_complete (ItipSendComponentData *isc)
ccd->identity_address = identity_address;
ccd->destinations = destinations;
ccd->subject = comp_subject (isc->registry, isc->method, isc->send_comps->data);
- ccd->ical_string = i_cal_component_as_ical_string_r (top_level);
+ ccd->ical_string = i_cal_component_as_ical_string (top_level);
ccd->content_type = comp_content_type (isc->send_comps->data, isc->method);
ccd->event_body_text = NULL;
ccd->attachments_list = isc->attachments_list;
@@ -2305,7 +2305,7 @@ itip_send_component_with_model (ECalModel *model,
isc->send_comps = g_slist_prepend (NULL, g_object_ref (send_comp));
isc->cal_client = g_object_ref (cal_client);
if (zones) {
- isc->zones = i_cal_component_new_clone (zones);
+ isc->zones = i_cal_component_clone (zones);
}
isc->attachments_list = attachments_list;
if (users) {
@@ -2407,7 +2407,7 @@ itip_send_component (ESourceRegistry *registry,
isc->send_comps = g_slist_prepend (NULL, g_object_ref (send_comp));
isc->cal_client = g_object_ref (cal_client);
if (zones)
- isc->zones = i_cal_component_new_clone (zones);
+ isc->zones = i_cal_component_clone (zones);
isc->attachments_list = attachments_list;
if (users) {
GSList *link;
@@ -2496,7 +2496,7 @@ reply_to_calendar_comp (ESourceRegistry *registry,
ccd->identity_address = identity_address;
ccd->destinations = comp_to_list (registry, method, ecomps->data, NULL, reply_all, NULL);
ccd->subject = comp_subject (registry, method, ecomps->data);
- ccd->ical_string = i_cal_component_as_ical_string_r (top_level);
+ ccd->ical_string = i_cal_component_as_ical_string (top_level);
ccd->send_comps = ecomps;
ccd->show_only = TRUE;
@@ -2651,7 +2651,7 @@ itip_publish_begin (ECalComponent *pub_comp,
g_object_unref (prop), prop = i_cal_component_get_next_property (icomp,
I_CAL_FREEBUSY_PROPERTY)) {
ICalProperty *p;
- p = i_cal_property_new_clone (prop);
+ p = i_cal_property_clone (prop);
i_cal_component_take_property (icomp_clone, p);
}
}
diff --git a/src/calendar/gui/print.c b/src/calendar/gui/print.c
index 20ff86754e..ada2b17a74 100644
--- a/src/calendar/gui/print.c
+++ b/src/calendar/gui/print.c
@@ -239,7 +239,7 @@ convert_timet_to_struct_tm (time_t time,
ICalTime *tt;
/* Convert it to an ICalTime. */
- tt = i_cal_time_from_timet_with_zone (time, FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (time, FALSE, zone);
*tm = e_cal_util_icaltime_to_tm (tt);
@@ -1160,8 +1160,8 @@ print_day_add_event (ECalModelComponent *comp_data,
g_return_val_if_fail (start < day_starts[days_shown], -1);
g_return_val_if_fail (end > day_starts[0], -1);
- start_tt = i_cal_time_from_timet_with_zone (start, FALSE, zone);
- end_tt = i_cal_time_from_timet_with_zone (end, FALSE, zone);
+ start_tt = i_cal_time_new_from_timet_with_zone (start, FALSE, zone);
+ end_tt = i_cal_time_new_from_timet_with_zone (end, FALSE, zone);
event.comp_data = comp_data;
event.start = start;
@@ -1613,14 +1613,14 @@ print_day_details (GtkPrintContext *context,
ICalTime *tt;
event = &g_array_index (pdi.events[0], EDayViewEvent, 0);
- tt = i_cal_time_from_timet_with_zone (event->start, FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (event->start, FALSE, zone);
if (i_cal_time_get_hour (tt) < pdi.start_hour)
pdi.start_hour = i_cal_time_get_hour (tt);
pdi.start_minute_offset = pdi.start_hour * 60;
g_clear_object (&tt);
event = &g_array_index (pdi.events[0], EDayViewEvent, pdi.events[0]->len - 1);
- tt = i_cal_time_from_timet_with_zone (event->end, FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (event->end, FALSE, zone);
if (i_cal_time_get_hour (tt) > pdi.end_hour || i_cal_time_get_hour (tt) == 0) {
pdi.end_hour = i_cal_time_get_hour (tt) ? i_cal_time_get_hour (tt) : 24;
if (i_cal_time_get_minute (tt) > 0)
@@ -2328,7 +2328,7 @@ print_month_summary (GtkPrintContext *context,
}
/* Remember which month we want. */
- tt = i_cal_time_from_timet_with_zone (whence, FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (whence, FALSE, zone);
month = i_cal_time_get_month (tt) - 1;
g_clear_object (&tt);
@@ -2440,7 +2440,7 @@ print_todo_details (GtkPrintContext *context,
if (!comp_data)
continue;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
if (!comp)
continue;
@@ -2794,14 +2794,14 @@ print_work_week_day_details (GtkPrintContext *context,
ICalTime *tt;
event = &g_array_index (pdi.events[0], EDayViewEvent, 0);
- tt = i_cal_time_from_timet_with_zone (event->start, FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (event->start, FALSE, zone);
if (i_cal_time_get_hour (tt) < pdi.start_hour)
pdi.start_hour = i_cal_time_get_hour (tt);
pdi.start_minute_offset = pdi.start_hour * 60;
g_clear_object (&tt);
event = &g_array_index (pdi.events[0], EDayViewEvent, pdi.events[0]->len - 1);
- tt = i_cal_time_from_timet_with_zone (event->end, FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (event->end, FALSE, zone);
if (i_cal_time_get_hour (tt) > pdi.end_hour || i_cal_time_get_hour (tt) == 0) {
pdi.end_hour = i_cal_time_get_hour (tt) ? i_cal_time_get_hour (tt) : 24;
if (i_cal_time_get_minute (tt) > 0)
@@ -3439,7 +3439,7 @@ print_calendar (ECalendarView *cal_view,
g_date_add_days (&date, 7);
- start_tt = i_cal_time_null_time ();
+ start_tt = i_cal_time_new_null_time ();
i_cal_time_set_is_date (start_tt, TRUE);
i_cal_time_set_date (start_tt,
g_date_get_year (&date),
diff --git a/src/calendar/gui/tag-calendar.c b/src/calendar/gui/tag-calendar.c
index e1a3936988..2926d27697 100644
--- a/src/calendar/gui/tag-calendar.c
+++ b/src/calendar/gui/tag-calendar.c
@@ -235,7 +235,7 @@ encode_timet_to_julian (time_t t,
if (!t)
return 0;
- tt = i_cal_time_from_timet_with_zone (t, is_date, (ICalTimezone *) zone);
+ tt = i_cal_time_new_from_timet_with_zone (t, is_date, (ICalTimezone *) zone);
if (!tt || !i_cal_time_is_valid_time (tt) || i_cal_time_is_null_time (tt)) {
g_clear_object (&tt);
@@ -911,13 +911,13 @@ prepare_tag (ECalendar *ecal,
&end_year, &end_month, &end_day))
return FALSE;
- start_tt = i_cal_time_null_time ();
+ start_tt = i_cal_time_new_null_time ();
i_cal_time_set_date (start_tt,
start_year,
start_month + 1,
start_day);
- end_tt = i_cal_time_null_time ();
+ end_tt = i_cal_time_new_null_time ();
i_cal_time_set_date (end_tt,
end_year,
end_month + 1,
@@ -1052,8 +1052,8 @@ tag_calendar_by_comp (ECalendar *ecal,
} else {
ICalTime *start, *end;
- start = i_cal_time_from_timet_with_zone (closure.start_time, FALSE, display_zone);
- end = i_cal_time_from_timet_with_zone (closure.end_time, FALSE, display_zone);
+ start = i_cal_time_new_from_timet_with_zone (closure.start_time, FALSE, display_zone);
+ end = i_cal_time_new_from_timet_with_zone (closure.end_time, FALSE, display_zone);
e_cal_recur_generate_instances_sync (e_cal_component_get_icalcomponent (comp),
start, end, tag_calendar_cb, &closure,
diff --git a/src/calendar/importers/icalendar-importer.c b/src/calendar/importers/icalendar-importer.c
index e0408b4d86..1ced3a146a 100644
--- a/src/calendar/importers/icalendar-importer.c
+++ b/src/calendar/importers/icalendar-importer.c
@@ -231,9 +231,9 @@ update_objects (ECalClient *cal_client,
i_cal_component_set_method (vcal, I_CAL_METHOD_CANCEL);
else
i_cal_component_set_method (vcal, I_CAL_METHOD_PUBLISH);
- i_cal_component_take_component (vcal, i_cal_component_new_clone (icomp));
+ i_cal_component_take_component (vcal, i_cal_component_clone (icomp));
} else if (kind == I_CAL_VCALENDAR_COMPONENT) {
- vcal = i_cal_component_new_clone (icomp);
+ vcal = i_cal_component_clone (icomp);
if (!e_cal_util_component_has_property (vcal, I_CAL_METHOD_PROPERTY))
i_cal_component_set_method (vcal, I_CAL_METHOD_PUBLISH);
} else {
@@ -1537,7 +1537,7 @@ ical_get_preview (ICalComponent *icomp)
subcomp;
g_object_unref (subcomp), subcomp = i_cal_component_get_next_component (icomp,
I_CAL_VTIMEZONE_COMPONENT)) {
ICalTimezone *zone = i_cal_timezone_new ();
- if (!i_cal_timezone_set_component (zone, i_cal_component_new_clone (subcomp)) ||
!i_cal_timezone_get_tzid (zone)) {
+ if (!i_cal_timezone_set_component (zone, i_cal_component_clone (subcomp)) ||
!i_cal_timezone_get_tzid (zone)) {
g_object_unref (zone);
} else {
g_hash_table_insert (timezones, (gchar *) i_cal_timezone_get_tzid (zone), zone);
@@ -1559,7 +1559,7 @@ ical_get_preview (ICalComponent *icomp)
gchar *formatted_dt;
const gchar *summary_txt = NULL;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (subcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (subcomp));
if (!comp)
continue;
diff --git a/src/e-util/test-source-selector.c b/src/e-util/test-source-selector.c
index 5677a1c9cf..44231f43e5 100644
--- a/src/e-util/test-source-selector.c
+++ b/src/e-util/test-source-selector.c
@@ -273,7 +273,7 @@ cal_view_objects_added_cb (ECalClientView *client_view,
ICalComponent *icomp = link->data;
if (icomp) {
- gchar *str = i_cal_component_as_ical_string_r (icomp);
+ gchar *str = i_cal_component_as_ical_string (icomp);
g_print ("%s\n -----------------------------\n", str);
g_free (str);
} else {
@@ -296,7 +296,7 @@ cal_view_objects_modified_cb (ECalClientView *client_view,
ICalComponent *icomp = link->data;
if (icomp) {
- gchar *str = i_cal_component_as_ical_string_r (icomp);
+ gchar *str = i_cal_component_as_ical_string (icomp);
g_print ("%s\n -----------------------------\n", str);
g_free (str);
} else
@@ -466,7 +466,7 @@ create_view_clicked_cb (GtkWidget *button,
ICalTime *tt;
gchar *start, *end;
- tt = i_cal_time_today ();
+ tt = i_cal_time_new_today ();
start = isodate_from_time_t (i_cal_time_as_timet (tt));
i_cal_time_adjust (tt, 14, 0, 0, 0);
end = isodate_from_time_t (i_cal_time_as_timet (tt));
diff --git a/src/modules/calendar/e-cal-attachment-handler.c b/src/modules/calendar/e-cal-attachment-handler.c
index b3e7e0faee..fd9c19839d 100644
--- a/src/modules/calendar/e-cal-attachment-handler.c
+++ b/src/modules/calendar/e-cal-attachment-handler.c
@@ -197,11 +197,11 @@ import_component_thread (EAlertSinkThreadJobData *job_data,
i_cal_component_set_method (vcalendar, I_CAL_METHOD_CANCEL);
else
i_cal_component_set_method (vcalendar, I_CAL_METHOD_PUBLISH);
- i_cal_component_take_component (vcalendar, i_cal_component_new_clone (icd->icomp));
+ i_cal_component_take_component (vcalendar, i_cal_component_clone (icd->icomp));
break;
case I_CAL_VCALENDAR_COMPONENT:
- vcalendar = i_cal_component_new_clone (icd->icomp);
+ vcalendar = i_cal_component_clone (icd->icomp);
if (!e_cal_util_component_has_property (vcalendar, I_CAL_METHOD_PROPERTY))
i_cal_component_set_method (vcalendar, I_CAL_METHOD_PUBLISH);
break;
@@ -352,7 +352,7 @@ attachment_handler_run_dialog (GtkWindow *parent,
icd = g_new0 (ImportComponentData, 1);
icd->shell = g_object_ref (shell);
icd->source = g_object_ref (source);
- icd->icomp = i_cal_component_new_clone (icomp);
+ icd->icomp = i_cal_component_clone (icomp);
icd->extension_name = extension_name;
activity = e_shell_view_submit_thread_job (shell_view, description, alert_ident,
diff --git a/src/modules/calendar/e-cal-base-shell-backend.c b/src/modules/calendar/e-cal-base-shell-backend.c
index bdc0c2468f..cf9171e8dd 100644
--- a/src/modules/calendar/e-cal-base-shell-backend.c
+++ b/src/modules/calendar/e-cal-base-shell-backend.c
@@ -409,7 +409,7 @@ populate_g_date (GDate *date,
if ((gint) utc_time == -1)
return;
- itt = i_cal_time_from_timet_with_zone (utc_time, FALSE, zone);
+ itt = i_cal_time_new_from_timet_with_zone (utc_time, FALSE, zone);
if (itt && !i_cal_time_is_null_time (itt) &&
i_cal_time_is_valid_time (itt)) {
@@ -433,7 +433,7 @@ convert_time_from_isodate (const gchar *text,
if (use_date_zone && strlen (text) == 8) {
ICalTime *itt;
- itt = i_cal_time_from_timet_with_zone (res, TRUE, NULL);
+ itt = i_cal_time_new_from_timet_with_zone (res, TRUE, NULL);
res = i_cal_time_as_timet_with_zone (itt, use_date_zone);
g_clear_object (&itt);
}
diff --git a/src/modules/calendar/e-cal-shell-content.c b/src/modules/calendar/e-cal-shell-content.c
index 15bb59fc28..8a701af9f1 100644
--- a/src/modules/calendar/e-cal-shell-content.c
+++ b/src/modules/calendar/e-cal-shell-content.c
@@ -98,7 +98,7 @@ convert_to_local_zone (time_t tm,
ICalTime *itt;
time_t tt;
- itt = i_cal_time_from_timet_with_zone (tm, FALSE, from_zone);
+ itt = i_cal_time_new_from_timet_with_zone (tm, FALSE, from_zone);
tt = i_cal_time_as_timet (itt);
g_clear_object (&itt);
@@ -396,11 +396,11 @@ cal_shell_content_change_selection_in_current_view (ECalShellContent *cal_shell_
if (e_calendar_view_get_selected_time_range (view, ¤t_sel_start,
¤t_sel_end)) {
ICalTime *itt;
- itt = i_cal_time_from_timet_with_zone (current_sel_start, 0, zone);
+ itt = i_cal_time_new_from_timet_with_zone (current_sel_start, 0, zone);
current_sel_start = i_cal_time_as_timet_with_zone (itt, NULL);
g_clear_object (&itt);
- itt = i_cal_time_from_timet_with_zone (current_sel_end, 0, zone);
+ itt = i_cal_time_new_from_timet_with_zone (current_sel_end, 0, zone);
current_sel_end = i_cal_time_as_timet_with_zone (itt, NULL);
g_clear_object (&itt);
@@ -1019,7 +1019,7 @@ cal_shell_content_check_state (EShellContent *shell_content)
/* XXX This probably belongs in comp-util.c. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
user_email = itip_get_comp_attendee (registry, comp, client);
selection_is_organizer =
@@ -1104,7 +1104,7 @@ cal_shell_content_get_default_time (ECalModel *model,
}
zone = e_cal_model_get_timezone (model);
- itt = i_cal_time_current_time_with_zone (zone);
+ itt = i_cal_time_new_current_with_zone (zone);
tt = i_cal_time_as_timet_with_zone (itt, zone);
g_clear_object (&itt);
@@ -1153,7 +1153,7 @@ update_adjustment (ECalShellContent *cal_shell_content,
return;
/* Convert it to a time_t. */
- start_tt = i_cal_time_null_time ();
+ start_tt = i_cal_time_new_null_time ();
i_cal_time_set_date (start_tt,
g_date_get_year (&start_date),
g_date_get_month (&start_date),
@@ -2250,7 +2250,7 @@ e_cal_shell_content_move_view_range (ECalShellContent *cal_shell_content,
cal_shell_content_move_view_range_relative (cal_shell_content, +1);
break;
case E_CALENDAR_VIEW_MOVE_TO_TODAY:
- tt = i_cal_time_current_time_with_zone (zone);
+ tt = i_cal_time_new_current_with_zone (zone);
g_date_set_dmy (&date, i_cal_time_get_day (tt), i_cal_time_get_month (tt),
i_cal_time_get_year (tt));
g_clear_object (&tt);
/* one-day selection takes care of the view range move with left view kind */
diff --git a/src/modules/calendar/e-cal-shell-view-actions.c b/src/modules/calendar/e-cal-shell-view-actions.c
index a34670b422..a3fb9ad89e 100644
--- a/src/modules/calendar/e-cal-shell-view-actions.c
+++ b/src/modules/calendar/e-cal-shell-view-actions.c
@@ -646,11 +646,11 @@ action_event_delegate_cb (GtkAction *action,
return;
client = event->comp_data->client;
- clone = i_cal_component_new_clone (event->comp_data->icalcomp);
+ clone = i_cal_component_clone (event->comp_data->icalcomp);
/* Set the attendee status for the delegate. */
- component = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (clone));
+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (clone));
attendee = itip_get_comp_attendee (registry, component, client);
@@ -765,7 +765,7 @@ action_event_forward_cb (GtkAction *action,
client = event->comp_data->client;
icomp = event->comp_data->icalcomp;
- component = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
g_return_if_fail (component != NULL);
itip_send_component_with_model (e_calendar_view_get_model (calendar_view),
@@ -881,14 +881,14 @@ action_event_occurrence_movable_cb (GtkAction *action,
/* For the recurring object, we add an exception
* to get rid of the instance. */
- recurring_component = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ recurring_component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
id = e_cal_component_get_id (recurring_component);
/* For the unrecurred instance, we duplicate the original object,
* create a new UID for it, get rid of the recurrence rules, and
* set the start and end times to the instance times. */
- exception_component = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ exception_component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
uid = e_util_generate_uid ();
e_cal_component_set_uid (exception_component, uid);
@@ -900,10 +900,10 @@ action_event_occurrence_movable_cb (GtkAction *action,
e_cal_component_set_exdates (exception_component, NULL);
e_cal_component_set_exrules (exception_component, NULL);
- date = e_cal_component_datetime_new_take (i_cal_time_from_timet_with_zone
(event->comp_data->instance_start, FALSE, timezone),
+ date = e_cal_component_datetime_new_take (i_cal_time_new_from_timet_with_zone
(event->comp_data->instance_start, FALSE, timezone),
timezone ? g_strdup (i_cal_timezone_get_tzid (timezone)) : NULL);
cal_comp_set_dtstart_with_oldzone (client, exception_component, date);
- e_cal_component_datetime_take_value (date, i_cal_time_from_timet_with_zone
(event->comp_data->instance_end, FALSE, timezone));
+ e_cal_component_datetime_take_value (date, i_cal_time_new_from_timet_with_zone
(event->comp_data->instance_end, FALSE, timezone));
cal_comp_set_dtend_with_oldzone (client, exception_component, date);
e_cal_component_datetime_free (date);
@@ -913,7 +913,7 @@ action_event_occurrence_movable_cb (GtkAction *action,
mmd->client = g_object_ref (client);
mmd->remove_uid = g_strdup (e_cal_component_id_get_uid (id));
mmd->remove_rid = g_strdup (e_cal_component_id_get_rid (id));
- mmd->create_icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent
(exception_component));
+ mmd->create_icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (exception_component));
activity = e_shell_view_submit_thread_job (E_SHELL_VIEW (cal_shell_view),
_("Making an occurrence movable"), "calendar:failed-make-movable",
@@ -964,7 +964,7 @@ action_event_edit_as_new_cb (GtkAction *action,
return;
}
- clone = i_cal_component_new_clone (event->comp_data->icalcomp);
+ clone = i_cal_component_clone (event->comp_data->icalcomp);
uid = e_util_generate_uid ();
i_cal_component_set_uid (clone, uid);
@@ -1006,7 +1006,7 @@ action_event_print_cb (GtkAction *action,
client = event->comp_data->client;
icomp = event->comp_data->icalcomp;
- component = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
print_comp (
component, client,
@@ -1046,7 +1046,7 @@ cal_shell_view_actions_reply (ECalShellView *cal_shell_view,
client = event->comp_data->client;
icomp = event->comp_data->icalcomp;
- component = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
reply_to_calendar_comp (
registry, E_CAL_COMPONENT_METHOD_REPLY,
@@ -1168,7 +1168,7 @@ edit_event_as (ECalShellView *cal_shell_view,
if (!as_meeting && icomp) {
/* remove organizer and all attendees */
/* do it on a copy, as user can cancel changes */
- icomp = i_cal_component_new_clone (icomp);
+ icomp = i_cal_component_clone (icomp);
e_cal_util_component_remove_property_by_kind (icomp, I_CAL_ATTENDEE_PROPERTY, TRUE);
e_cal_util_component_remove_property_by_kind (icomp, I_CAL_ORGANIZER_PROPERTY, TRUE);
diff --git a/src/modules/calendar/e-cal-shell-view-memopad.c b/src/modules/calendar/e-cal-shell-view-memopad.c
index 74820efea5..a42d6d4f47 100644
--- a/src/modules/calendar/e-cal-shell-view-memopad.c
+++ b/src/modules/calendar/e-cal-shell-view-memopad.c
@@ -46,7 +46,7 @@ action_calendar_memopad_forward_cb (GtkAction *action,
g_slist_free (list);
/* XXX We only forward the first selected memo. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
g_return_if_fail (comp != NULL);
itip_send_component_with_model (e_memo_table_get_model (memo_table),
@@ -157,7 +157,7 @@ action_calendar_memopad_print_cb (GtkAction *action,
g_slist_free (list);
/* XXX We only print the first selected memo. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
print_comp (
comp, comp_data->client,
diff --git a/src/modules/calendar/e-cal-shell-view-private.c b/src/modules/calendar/e-cal-shell-view-private.c
index fcec8ac770..45154c7a4b 100644
--- a/src/modules/calendar/e-cal-shell-view-private.c
+++ b/src/modules/calendar/e-cal-shell-view-private.c
@@ -59,7 +59,7 @@ cal_shell_view_get_current_time (ECalendarItem *calitem,
model = e_cal_base_shell_content_get_model (E_CAL_BASE_SHELL_CONTENT (cal_shell_content));
timezone = e_cal_model_get_timezone (model);
- tt = i_cal_time_from_timet_with_zone (time (NULL), FALSE, timezone);
+ tt = i_cal_time_new_from_timet_with_zone (time (NULL), FALSE, timezone);
tm = e_cal_util_icaltime_to_tm (tt);
g_clear_object (&tt);
@@ -798,7 +798,7 @@ cal_searching_check_candidates (ECalShellView *cal_shell_view)
data_model = e_cal_base_shell_content_get_data_model (E_CAL_BASE_SHELL_CONTENT
(cal_shell_view->priv->cal_shell_content));
zone = e_cal_data_model_get_timezone (data_model);
- tt = i_cal_time_from_timet_with_zone (candidate, FALSE, zone);
+ tt = i_cal_time_new_from_timet_with_zone (candidate, FALSE, zone);
if (tt && i_cal_time_is_valid_time (tt) && !i_cal_time_is_null_time (tt)) {
ECalendarView *cal_view;
diff --git a/src/modules/calendar/e-cal-shell-view-taskpad.c b/src/modules/calendar/e-cal-shell-view-taskpad.c
index 27445f6edf..57aad8663e 100644
--- a/src/modules/calendar/e-cal-shell-view-taskpad.c
+++ b/src/modules/calendar/e-cal-shell-view-taskpad.c
@@ -69,7 +69,7 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
g_slist_free (list);
/* XXX We only forward the first selected task. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
g_return_if_fail (comp != NULL);
itip_send_component_with_model (e_task_table_get_model (task_table),
@@ -225,7 +225,7 @@ action_calendar_taskpad_print_cb (GtkAction *action,
g_slist_free (list);
/* XXX We only print the first selected task. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
print_comp (
comp, comp_data->client,
diff --git a/src/modules/calendar/e-cal-shell-view.c b/src/modules/calendar/e-cal-shell-view.c
index e8d051f030..4d4b3e6d1c 100644
--- a/src/modules/calendar/e-cal-shell-view.c
+++ b/src/modules/calendar/e-cal-shell-view.c
@@ -112,7 +112,7 @@ cal_shell_view_execute_search (EShellView *shell_view)
data_model = e_cal_base_shell_content_get_data_model (E_CAL_BASE_SHELL_CONTENT (cal_shell_content));
timezone = e_cal_data_model_get_timezone (data_model);
- current_time = i_cal_time_current_time_with_zone (timezone);
+ current_time = i_cal_time_new_current_with_zone (timezone);
now_time = time_day_begin (i_cal_time_as_timet (current_time));
g_clear_object (¤t_time);
diff --git a/src/modules/calendar/e-memo-shell-content.c b/src/modules/calendar/e-memo-shell-content.c
index ea3a36c3f8..38875e936b 100644
--- a/src/modules/calendar/e-memo-shell-content.c
+++ b/src/modules/calendar/e-memo-shell-content.c
@@ -86,11 +86,11 @@ memo_shell_content_table_foreach_cb (gint model_row,
foreach_data->model, model_row);
vcal = e_cal_util_new_top_level ();
- clone = i_cal_component_new_clone (comp_data->icalcomp);
+ clone = i_cal_component_clone (comp_data->icalcomp);
e_cal_util_add_timezones_from_component (vcal, comp_data->icalcomp);
i_cal_component_take_component (vcal, clone);
- string = i_cal_component_as_ical_string_r (vcal);
+ string = i_cal_component_as_ical_string (vcal);
if (string != NULL) {
ESource *source;
const gchar *source_uid;
@@ -191,7 +191,7 @@ memo_shell_content_cursor_change_cb (EMemoShellContent *memo_shell_content,
ECalComponent *comp;
comp = e_cal_component_new_from_icalcomponent (
- i_cal_component_new_clone (comp_data->icalcomp));
+ i_cal_component_clone (comp_data->icalcomp));
e_cal_component_preview_display (
memo_preview, comp_data->client, comp,
diff --git a/src/modules/calendar/e-memo-shell-view-actions.c
b/src/modules/calendar/e-memo-shell-view-actions.c
index ab8bab8e98..b925e191eb 100644
--- a/src/modules/calendar/e-memo-shell-view-actions.c
+++ b/src/modules/calendar/e-memo-shell-view-actions.c
@@ -72,7 +72,7 @@ action_memo_forward_cb (GtkAction *action,
g_slist_free (list);
/* XXX We only forward the first selected memo. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
g_return_if_fail (comp != NULL);
itip_send_component_with_model (e_memo_table_get_model (memo_table),
@@ -463,7 +463,7 @@ action_memo_print_cb (GtkAction *action,
g_slist_free (list);
/* XXX We only print the first selected memo. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
print_comp (
comp, comp_data->client,
diff --git a/src/modules/calendar/e-task-shell-content.c b/src/modules/calendar/e-task-shell-content.c
index 50a974a6d7..2e21548b2e 100644
--- a/src/modules/calendar/e-task-shell-content.c
+++ b/src/modules/calendar/e-task-shell-content.c
@@ -85,11 +85,11 @@ task_shell_content_table_foreach_cb (gint model_row,
foreach_data->model, model_row);
vcal = e_cal_util_new_top_level ();
- clone = i_cal_component_new_clone (comp_data->icalcomp);
+ clone = i_cal_component_clone (comp_data->icalcomp);
e_cal_util_add_timezones_from_component (vcal, comp_data->icalcomp);
i_cal_component_take_component (vcal, clone);
- string = i_cal_component_as_ical_string_r (vcal);
+ string = i_cal_component_as_ical_string (vcal);
if (string != NULL) {
ESource *source;
const gchar *source_uid;
@@ -190,7 +190,7 @@ task_shell_content_cursor_change_cb (ETaskShellContent *task_shell_content,
ECalComponent *comp;
comp = e_cal_component_new_from_icalcomponent (
- i_cal_component_new_clone (comp_data->icalcomp));
+ i_cal_component_clone (comp_data->icalcomp));
e_cal_component_preview_display (
task_preview, comp_data->client, comp,
diff --git a/src/modules/calendar/e-task-shell-view-actions.c
b/src/modules/calendar/e-task-shell-view-actions.c
index 48da46078e..7703084961 100644
--- a/src/modules/calendar/e-task-shell-view-actions.c
+++ b/src/modules/calendar/e-task-shell-view-actions.c
@@ -95,7 +95,7 @@ action_task_forward_cb (GtkAction *action,
g_slist_free (list);
/* XXX We only forward the first selected task. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
g_return_if_fail (comp != NULL);
itip_send_component_with_model (e_task_table_get_model (task_table),
@@ -532,7 +532,7 @@ action_task_print_cb (GtkAction *action,
g_slist_free (list);
/* XXX We only print the first selected task. */
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (comp_data->icalcomp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (comp_data->icalcomp));
print_comp (
comp, comp_data->client,
diff --git a/src/modules/calendar/e-task-shell-view.c b/src/modules/calendar/e-task-shell-view.c
index 5db889ae28..e88328cf6a 100644
--- a/src/modules/calendar/e-task-shell-view.c
+++ b/src/modules/calendar/e-task-shell-view.c
@@ -72,7 +72,7 @@ task_shell_view_execute_search (EShellView *shell_view)
model = e_task_table_get_model (task_table);
data_model = e_cal_model_get_data_model (model);
timezone = e_cal_model_get_timezone (model);
- current_time = i_cal_time_current_time_with_zone (timezone);
+ current_time = i_cal_time_new_current_with_zone (timezone);
now_time = time_day_begin (i_cal_time_as_timet (current_time));
g_clear_object (¤t_time);
diff --git a/src/modules/composer-to-meeting/e-meeting-to-composer.c
b/src/modules/composer-to-meeting/e-meeting-to-composer.c
index 0e79d1b1a9..0335a9cdde 100644
--- a/src/modules/composer-to-meeting/e-meeting-to-composer.c
+++ b/src/modules/composer-to-meeting/e-meeting-to-composer.c
@@ -173,7 +173,7 @@ meeting_to_composer_composer_created_cb (GObject *source_object,
/* Just a trick to not show validation errors when getting the component */
e_comp_editor_set_updating (comp_editor, TRUE);
- icomp = i_cal_component_new_clone (e_comp_editor_get_component (comp_editor));
+ icomp = i_cal_component_clone (e_comp_editor_get_component (comp_editor));
e_comp_editor_fill_component (comp_editor, icomp);
e_comp_editor_set_updating (comp_editor, did_updating);
diff --git a/src/modules/itip-formatter/itip-view.c b/src/modules/itip-formatter/itip-view.c
index 295e4cd4d6..7ef740476f 100644
--- a/src/modules/itip-formatter/itip-view.c
+++ b/src/modules/itip-formatter/itip-view.c
@@ -3207,7 +3207,7 @@ find_attendee (ICalComponent *icomp,
gchar *attendee;
gchar *text;
- attendee = i_cal_property_get_value_as_string_r (prop);
+ attendee = i_cal_property_get_value_as_string (prop);
if (!attendee)
continue;
@@ -3352,7 +3352,7 @@ find_to_address (ItipView *view,
view->priv->to_name = g_strdup (i_cal_parameter_get_cn (param));
g_clear_object (¶m);
- text = i_cal_property_get_value_as_string_r (prop);
+ text = i_cal_property_get_value_as_string (prop);
view->priv->to_address = g_strdup (itip_strip_mailto (text));
g_free (text);
@@ -3441,7 +3441,7 @@ find_to_address (ItipView *view,
view->priv->to_name = g_strdup (i_cal_parameter_get_cn (param));
g_clear_object (¶m);
- text = i_cal_property_get_value_as_string_r (prop);
+ text = i_cal_property_get_value_as_string (prop);
view->priv->to_address = g_strdup (itip_strip_mailto (text));
g_free (text);
@@ -3489,7 +3489,7 @@ find_from_address (ItipView *view,
if (!prop)
return;
- organizer = i_cal_property_get_value_as_string_r (prop);
+ organizer = i_cal_property_get_value_as_string (prop);
if (organizer) {
organizer_clean = g_strdup (itip_strip_mailto (organizer));
organizer_clean = g_strstrip (organizer_clean);
@@ -5120,14 +5120,14 @@ update_item (ItipView *view,
* information (unless it's being saved to an Exchange folder
* and you then look at it in Outlook).
*/
- stamp = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
- str = i_cal_time_as_ical_string_r (stamp);
+ stamp = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+ str = i_cal_time_as_ical_string (stamp);
e_cal_util_component_set_x_property (view->priv->ical_comp, "X-MICROSOFT-CDO-REPLYTIME", str);
g_clear_object (&stamp);
g_free (str);
- toplevel_clone = i_cal_component_new_clone (view->priv->top_level);
- clone = i_cal_component_new_clone (view->priv->ical_comp);
+ toplevel_clone = i_cal_component_clone (view->priv->top_level);
+ clone = i_cal_component_clone (view->priv->ical_comp);
i_cal_component_add_component (toplevel_clone, clone);
i_cal_component_set_method (toplevel_clone, view->priv->method);
@@ -5144,7 +5144,7 @@ update_item (ItipView *view,
icomp;
g_object_unref (icomp), icomp = i_cal_component_get_next_component
(view->priv->main_comp, use_kind)) {
if (i_cal_object_get_native (I_CAL_OBJECT (icomp)) != i_cal_object_get_native
(I_CAL_OBJECT (view->priv->ical_comp))) {
- ICalComponent *di_clone = i_cal_component_new_clone (icomp);
+ ICalComponent *di_clone = i_cal_component_clone (icomp);
if (remove_alarms)
remove_alarms_in_component (di_clone);
@@ -5493,7 +5493,7 @@ update_attendee_status_icomp (ItipView *view,
itip_strip_mailto (e_cal_component_attendee_get_value (a)),
itip_strip_mailto (delegate), NULL);
if (response == GTK_RESPONSE_YES) {
- i_cal_component_take_property (icomp, i_cal_property_new_clone
(del_prop));
+ i_cal_component_take_property (icomp, i_cal_property_clone
(del_prop));
} else if (response == GTK_RESPONSE_NO) {
remove_delegate (view, delegate, itip_strip_mailto
(e_cal_component_attendee_get_value (a)), comp);
g_clear_object (&del_prop);
@@ -5524,7 +5524,7 @@ update_attendee_status_icomp (ItipView *view,
if (response == GTK_RESPONSE_YES) {
/* Already declared in this function */
ICalProperty *prop = find_attendee (icomp, itip_strip_mailto
(e_cal_component_attendee_get_value (a)));
- i_cal_component_take_property (icomp,
i_cal_property_new_clone (prop));
+ i_cal_component_take_property (icomp, i_cal_property_clone
(prop));
} else if (response == GTK_RESPONSE_NO) {
remove_delegate (
view,
@@ -5566,7 +5566,7 @@ update_attendee_status_icomp (ItipView *view,
g_clear_object (&subprop);
new_prop = find_attendee (org_icomp, itip_strip_mailto
(e_cal_component_attendee_get_value (a)));
- i_cal_component_take_property (icomp, i_cal_property_new_clone
(new_prop));
+ i_cal_component_take_property (icomp, i_cal_property_clone
(new_prop));
g_clear_object (&new_prop);
} else {
change_status (
@@ -5916,7 +5916,7 @@ extract_itip_data (ItipView *view,
next_subcomp = i_cal_comp_iter_next (iter);
- clone = i_cal_component_new_clone (tz_comp);
+ clone = i_cal_component_clone (tz_comp);
i_cal_component_take_component (view->priv->top_level, clone);
g_object_unref (tz_comp);
@@ -6061,7 +6061,7 @@ extract_itip_data (ItipView *view,
gchar *my_address;
prop = NULL;
- comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(view->priv->ical_comp));
+ comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (view->priv->ical_comp));
my_address = itip_get_comp_attendee (
view->priv->registry, comp, NULL);
g_clear_object (&comp);
@@ -6170,7 +6170,7 @@ extract_itip_data (ItipView *view,
e_cal_component_alarm_set_action (acomp, E_CAL_COMPONENT_ALARM_DISPLAY);
- duration = i_cal_duration_null_duration ();
+ duration = i_cal_duration_new_null_duration ();
i_cal_duration_set_is_neg (duration, TRUE);
switch (units) {
diff --git a/src/plugins/mail-to-task/mail-to-task.c b/src/plugins/mail-to-task/mail-to-task.c
index 806cc6f825..e28dba3e8d 100644
--- a/src/plugins/mail-to-task/mail-to-task.c
+++ b/src/plugins/mail-to-task/mail-to-task.c
@@ -763,7 +763,7 @@ do_manage_comp_idle (struct _manage_comp *mc)
if (chosen == GTK_RESPONSE_YES) {
edit_comp = e_cal_component_new ();
- if (!e_cal_component_set_icalcomponent (edit_comp, i_cal_component_new_clone
(mc->stored_comp))) {
+ if (!e_cal_component_set_icalcomponent (edit_comp, i_cal_component_clone
(mc->stored_comp))) {
g_object_unref (edit_comp);
edit_comp = NULL;
error = g_error_new (
@@ -898,8 +898,8 @@ do_mail_to_event (AsyncData *data)
#undef cache_backend_prop
/* set start day of the event as today, without time - easier than looking for a calendar's
time zone */
- tt = i_cal_time_today ();
- tt2 = i_cal_time_new_clone (tt);
+ tt = i_cal_time_new_today ();
+ tt2 = i_cal_time_clone (tt);
i_cal_time_adjust (tt2, 1, 0, 0, 0);
dt = e_cal_component_datetime_new_take (tt, NULL);
diff --git a/src/plugins/pst-import/pst-importer.c b/src/plugins/pst-import/pst-importer.c
index 13f3ea8830..1622e1c290 100644
--- a/src/plugins/pst-import/pst-importer.c
+++ b/src/plugins/pst-import/pst-importer.c
@@ -1226,9 +1226,9 @@ pst_process_email (PstImporter *m,
i_cal_component_set_method (vcal, method);
- i_cal_component_take_component (vcal, i_cal_component_new_clone
(e_cal_component_get_icalcomponent (comp)));
+ i_cal_component_take_component (vcal, i_cal_component_clone
(e_cal_component_get_icalcomponent (comp)));
- comp_str = i_cal_component_as_ical_string_r (vcal);
+ comp_str = i_cal_component_as_ical_string (vcal);
g_object_unref (vcal);
g_object_unref (comp);
@@ -1674,7 +1674,7 @@ get_ical_date (FILETIME *date,
time_t t;
t = pst_fileTimeToUnixTime (date);
- return i_cal_time_from_timet_with_zone (t, is_date, NULL);
+ return i_cal_time_new_from_timet_with_zone (t, is_date, NULL);
} else {
return NULL;
}
@@ -1905,7 +1905,7 @@ fill_calcomponent (PstImporter *m,
ECalComponentAlarmTrigger *trigger = NULL;
ICalDuration *duration;
- duration = i_cal_duration_from_int (- (a->alarm_minutes) * 60);
+ duration = i_cal_duration_new_from_int (- (a->alarm_minutes) * 60);
trigger = e_cal_component_alarm_trigger_new_relative
(E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START, duration);
e_cal_component_alarm_take_trigger (alarm, trigger);
g_object_unref (duration);
diff --git a/src/plugins/publish-calendar/publish-format-fb.c
b/src/plugins/publish-calendar/publish-format-fb.c
index 3e37bf1a3e..6163cfad2d 100644
--- a/src/plugins/publish-calendar/publish-format-fb.c
+++ b/src/plugins/publish-calendar/publish-format-fb.c
@@ -102,7 +102,7 @@ write_calendar (const gchar *uid,
for (iter = objects; iter; iter = iter->next) {
ECalComponent *comp = iter->data;
- ICalComponent *icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent
(comp));
+ ICalComponent *icomp = i_cal_component_clone (e_cal_component_get_icalcomponent
(comp));
if (!icomp)
continue;
@@ -121,7 +121,7 @@ write_calendar (const gchar *uid,
i_cal_component_take_component (top_level, icomp);
}
- ical_string = i_cal_component_as_ical_string_r (top_level);
+ ical_string = i_cal_component_as_ical_string (top_level);
success = g_output_stream_write_all (
stream, ical_string,
diff --git a/src/plugins/publish-calendar/publish-format-ical.c
b/src/plugins/publish-calendar/publish-format-ical.c
index 72602f264d..4e98fcdda4 100644
--- a/src/plugins/publish-calendar/publish-format-ical.c
+++ b/src/plugins/publish-calendar/publish-format-ical.c
@@ -59,7 +59,7 @@ insert_tz_comps (ICalParameter *param,
return;
}
- tzcomp = i_cal_component_new_clone (i_cal_timezone_get_component (zone));
+ tzcomp = i_cal_component_clone (i_cal_timezone_get_component (zone));
g_hash_table_insert (tdata->zones, (gpointer) tzid, (gpointer) tzcomp);
}
@@ -119,7 +119,7 @@ write_calendar (const gchar *uid,
tdata.client = E_CAL_CLIENT (client);
for (iter = objects; iter; iter = iter->next) {
- ICalComponent *icomp = i_cal_component_new_clone (iter->data);
+ ICalComponent *icomp = i_cal_component_clone (iter->data);
i_cal_component_foreach_tzid (icomp, insert_tz_comps, &tdata);
i_cal_component_take_component (top_level, icomp);
}
@@ -129,7 +129,7 @@ write_calendar (const gchar *uid,
g_hash_table_destroy (tdata.zones);
tdata.zones = NULL;
- ical_string = i_cal_component_as_ical_string_r (top_level);
+ ical_string = i_cal_component_as_ical_string (top_level);
res = g_output_stream_write_all (stream, ical_string, strlen (ical_string), NULL, NULL,
error);
g_free (ical_string);
e_util_free_nullable_object_slist (objects);
diff --git a/src/plugins/save-calendar/ical-format.c b/src/plugins/save-calendar/ical-format.c
index 3f87255d27..9a177c34d6 100644
--- a/src/plugins/save-calendar/ical-format.c
+++ b/src/plugins/save-calendar/ical-format.c
@@ -72,7 +72,7 @@ insert_tz_comps (ICalParameter *param,
return;
}
- tzcomp = i_cal_component_new_clone (i_cal_timezone_get_component (zone));
+ tzcomp = i_cal_component_clone (i_cal_timezone_get_component (zone));
g_hash_table_insert (tdata->zones, (gpointer) tzid, (gpointer) tzcomp);
}
@@ -133,7 +133,7 @@ do_save_calendar_ical (FormatHandler *handler,
tdata.client = E_CAL_CLIENT (source_client);
for (iter = objects; iter; iter = iter->next) {
- ICalComponent *icomp = i_cal_component_new_clone (iter->data);
+ ICalComponent *icomp = i_cal_component_clone (iter->data);
i_cal_component_foreach_tzid (icomp, insert_tz_comps, &tdata);
i_cal_component_take_component (top_level, icomp);
@@ -148,7 +148,7 @@ do_save_calendar_ical (FormatHandler *handler,
stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (selector))),
dest_uri, &error);
if (stream) {
- gchar *ical_str = i_cal_component_as_ical_string_r (top_level);
+ gchar *ical_str = i_cal_component_as_ical_string (top_level);
g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error);
g_output_stream_close (stream, NULL, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
