Remove deprecated icaltime_from_timet

Use icaltime_from_timet_with_zone instead.

14 files changed, 62 insertions, 93 deletions

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index df0c2ac2..f8c28430 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -6,6 +6,7 @@ Version 2.1.0:
  * icalvalue_as_ical_string() returns "TRUE" (non-zero) or "FALSE" (zero) values only.
  * new icalvalue.h convenience macros: ICAL_BOOLEAN_TRUE and ICAL_BOOLEAN_FALSE
  * Removed deprecated functions
+    * icaltime_from_timet (use icaltime_from_timet_with_zone)
     * icaltime_start_day_of_week (use icaltime_start_day_week)
     * icalproperty_remove_parameter (use icalproperty_remove_parameter_by_kind)
     * icalproperty_string_to_enum (use icalproperty_kind_and_string_to_enum)
diff --git a/examples/access_components.c b/examples/access_components.c
index be73ba6f..4548d70f 100644
--- a/examples/access_components.c
+++ b/examples/access_components.c
@@ -30,13 +30,13 @@ icalcomponent* create_new_component()
     /* variable definitions */
     icalcomponent* calendar;
     icalcomponent* event;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
+    struct icaltimetype atime = icaltime_from_timet_with_zone(time(0), 0, icaltimezone_get_utc_timezone());
     struct icalperiodtype rtime;
     icalproperty* property;
 
     /* Define a time type that will use as data later. */
-    rtime.start = icaltime_from_timet( time(0),0);
-    rtime.end = icaltime_from_timet( time(0),0);
+    rtime.start = icaltime_from_timet_with_zone(time(0), 0, icaltimezone_get_utc_timezone());
+    rtime.end = icaltime_from_timet_with_zone(time(0), 0, icaltimezone_get_utc_timezone());
     rtime.end.hour++;
 
     /* Create calendar and add properties */
@@ -198,11 +198,11 @@ icalcomponent* create_new_component_with_va_args()
 
     /* This is a similar set up to the last routine */
     icalcomponent* calendar;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
+    struct icaltimetype atime = icaltime_from_timet_with_zone(time(0), 0, icaltimezone_get_utc_timezone());
     struct icalperiodtype rtime;
 
-    rtime.start = icaltime_from_timet( time(0),0);
-    rtime.end = icaltime_from_timet( time(0),0);
+    rtime.start = icaltime_from_timet_with_zone(time(0), 0, icaltimezone_get_utc_timezone());
+    rtime.end = icaltime_from_timet_with_zone(time(0), 0, icaltimezone_get_utc_timezone());
     rtime.end.hour++;
 
     /* Some of these routines are the same as those in the previous
diff --git a/src/Net-ICal-Libical/netical.i b/src/Net-ICal-Libical/netical.i
index 762b2771..19bea6ef 100644
--- a/src/Net-ICal-Libical/netical.i
+++ b/src/Net-ICal-Libical/netical.i
@@ -193,7 +193,7 @@ struct icaltimetype
 
 
 /* Convert seconds past UNIX epoch to a timetype*/
-struct icaltimetype icaltime_from_timet(int v, int is_date);
+struct icaltimetype icaltime_from_timet_with_zone(int v, int is_date, const char* tzid);
 
 /* Return the time as seconds past the UNIX epoch */
 /* Normally, this returns a time_t, but SWIG tries to turn that type
diff --git a/src/libical/icaltime.c b/src/libical/icaltime.c
index 3992ca6b..4754b82d 100644
--- a/src/libical/icaltime.c
+++ b/src/libical/icaltime.c
@@ -181,27 +181,6 @@ static time_t make_time(struct tm *tm, int tzm)
     return (tim);
 }
 
-/**     @brief Constructor (deprecated).
- *
- * Convert seconds past UNIX epoch to a timetype.
- *
- * @deprecated This constructor is deprecated and shouldn't be used in
- *   new software.  Use icaltime_from_timet_with_zone(time_t, int,
- *   icaltimezone *) instead.  In the meantime, calls to this method
- *   return a floating time, which can always be converted to a local
- *   time with an appropriate call to icaltime_convert_to_zone().
- */
-
-struct icaltimetype icaltime_from_timet(const time_t tm, const int is_date)
-{
-#if NO_WARN_DEPRECATED == 0
-    icalerror_warn(
-        "icaltime_from_timet() is DEPRECATED, use icaltime_from_timet_with_zone() instead");
-#endif
-
-    return icaltime_from_timet_with_zone(tm, is_date, 0);
-}
-
 /**     @brief Constructor.
  *
  *      @param tm The time
diff --git a/src/libical/icaltime.h b/src/libical/icaltime.h
index c32b0ab9..5a7b2eda 100644
--- a/src/libical/icaltime.h
+++ b/src/libical/icaltime.h
@@ -141,9 +141,6 @@ LIBICAL_ICAL_EXPORT struct icaltimetype icaltime_current_time_with_zone(const ic
 /** Returns the current day as an icaltimetype, with is_date set. */
 LIBICAL_ICAL_EXPORT struct icaltimetype icaltime_today(void);
 
-/** Convert seconds past UNIX epoch to a timetype*/
-LIBICAL_ICAL_EXPORT struct icaltimetype icaltime_from_timet(const time_t v, const int is_date);
-
 /** Convert seconds past UNIX epoch to a timetype, using timezones. */
 LIBICAL_ICAL_EXPORT struct icaltimetype icaltime_from_timet_with_zone(const time_t tm,
                                                                       const int is_date,
diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c
index a4773783..9b7e6a93 100644
--- a/src/libical/icaltz-util.c
+++ b/src/libical/icaltz-util.c
@@ -208,7 +208,7 @@ static void find_transidx(time_t *transitions, ttinfo *types,
     struct icaltimetype itime;
 
     now = time(NULL);
-    itime = icaltime_from_timet(now, 0);
+    itime = icaltime_from_timet_with_zone(now, 0, NULL);
     itime.month = itime.day = 1;
     itime.hour = itime.minute = itime.second = 0;
     year_start = icaltime_as_timet(itime);
@@ -276,13 +276,13 @@ static void adjust_dtstart_day_to_rrule(icalcomponent *comp, struct icalrecurren
     icalrecur_iterator *iter;
 
     now = time(NULL);
-    itime = icaltime_from_timet(now, 0);
+    itime = icaltime_from_timet_with_zone(now, 0, NULL);
     itime.month = itime.day = 1;
     itime.hour = itime.minute = itime.second = 0;
     year_start = icaltime_as_timet(itime);
 
     comp_start = icalcomponent_get_dtstart(comp);
-    start = icaltime_from_timet(year_start, 0);
+    start = icaltime_from_timet_with_zone(year_start, 0, NULL);
 
     iter = icalrecur_iterator_new(rule, start);
     iter_start = icalrecur_iterator_next(iter);
@@ -502,7 +502,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
             } else {
                 trans = (time_t)types[zp_idx].gmtoff;
             }
-            icaltime = icaltime_from_timet(trans, 0);
+            icaltime = icaltime_from_timet_with_zone(trans, 0, NULL);
             dtstart = icaltime;
             dtstart.year = 1970;
             dtstart.minute = dtstart.second = 0;
@@ -545,7 +545,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
                 trans = (time_t)types[zp_idx].gmtoff;
             }
 
-            icaltime = icaltime_from_timet(trans, 0);
+            icaltime = icaltime_from_timet_with_zone(trans, 0, NULL);
             dtstart = icaltime;
             dtstart.year = 1970;
             dtstart.minute = dtstart.second = 0;
@@ -594,7 +594,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
             }
             icalprop = icalproperty_new_tzname(types[prev_idx].zname);
             icalcomponent_add_property(comp, icalprop);
-            dtstart = icaltime_from_timet(start, 0);
+            dtstart = icaltime_from_timet_with_zone(start, 0, NULL);
             icalprop = icalproperty_new_dtstart(dtstart);
             icalcomponent_add_property(comp, icalprop);
             icalprop = icalproperty_new_tzoffsetfrom(types[idx].gmtoff);
@@ -611,7 +611,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
         }
         icalprop = icalproperty_new_tzname(types[idx].zname);
         icalcomponent_add_property(comp, icalprop);
-        dtstart = icaltime_from_timet(start, 0);
+        dtstart = icaltime_from_timet_with_zone(start, 0, NULL);
         icalprop = icalproperty_new_dtstart(dtstart);
         icalcomponent_add_property(comp, icalprop);
         icalprop = icalproperty_new_tzoffsetfrom(types[prev_idx].gmtoff);
diff --git a/src/libicalss/icalbdbset.c b/src/libicalss/icalbdbset.c
index e881cd2f..117e83c4 100644
--- a/src/libicalss/icalbdbset.c
+++ b/src/libicalss/icalbdbset.c
@@ -1292,7 +1292,7 @@ icalsetiter icalbdbset_begin_component(icalset *set, icalcomponent_kind kind,
             }
 
             recur = icalproperty_get_rrule(rrule);
-            start = icaltime_from_timet(time(0), 0);
+            start = icaltime_from_timet_with_zone(time(0), 0, NULL);
 
             if (icalcomponent_isa(comp) == ICAL_VEVENT_COMPONENT) {
                 dtstart = icalcomponent_get_first_property(comp, ICAL_DTSTART_PROPERTY);
@@ -1400,7 +1400,7 @@ icalcomponent *icalbdbset_form_a_matched_recurrence_component(icalsetiter *itr)
     }
 
     recur = icalproperty_get_rrule(rrule);
-    start = icaltime_from_timet(time(0), 0);
+    start = icaltime_from_timet_with_zone(time(0), 0, NULL);
 
     if (icalcomponent_isa(comp) == ICAL_VEVENT_COMPONENT) {
         dtstart = icalcomponent_get_first_property(comp, ICAL_DTSTART_PROPERTY);
@@ -1514,7 +1514,7 @@ icalcomponent *icalbdbsetiter_to_next(icalset *set, icalsetiter *i)
             }
 
             recur = icalproperty_get_rrule(rrule);
-            start = icaltime_from_timet(time(0), 0);
+            start = icaltime_from_timet_with_zone(time(0), 0, NULL);
 
             if (icalcomponent_isa(comp) == ICAL_VEVENT_COMPONENT) {
                 dtstart = icalcomponent_get_first_property(comp, ICAL_DTSTART_PROPERTY);
diff --git a/src/libicalss/icalfileset.c b/src/libicalss/icalfileset.c
index 391e6496..d447c17d 100644
--- a/src/libicalss/icalfileset.c
+++ b/src/libicalss/icalfileset.c
@@ -774,7 +774,7 @@ icalsetiter icalfileset_begin_component(icalset *set, icalcomponent_kind kind, i
 
     icalerror_check_arg_re((set != 0), "set", icalsetiter_null);
 
-    start = icaltime_from_timet(time(0), 0);
+    start = icaltime_from_timet_with_zone(time(0), 0, NULL);
     itr.gauge = gauge;
 
     fset = (icalfileset *) set;
@@ -855,7 +855,7 @@ icalcomponent *icalfileset_form_a_matched_recurrence_component(icalsetiter *itr)
     icalproperty *dtstart, *rrule, *prop, *due;
     struct icalrecurrencetype recur;
 
-    start = icaltime_from_timet(time(0), 0);
+    start = icaltime_from_timet_with_zone(time(0), 0, NULL);
     comp = itr->last_component;
 
     if (comp == NULL || itr->gauge == NULL) {
@@ -921,8 +921,8 @@ icalcomponent *icalfilesetiter_to_next(icalset *set, icalsetiter *i)
 
     _unused(set);
 
-    start = icaltime_from_timet(time(0), 0);
-    next = icaltime_from_timet(time(0), 0);
+    start = icaltime_from_timet_with_zone(time(0), 0, NULL);
+    next = icaltime_from_timet_with_zone(time(0), 0, NULL);
 
     do {
         c = icalcompiter_next(&(i->iter));
diff --git a/src/libicalss/icalmessage.c b/src/libicalss/icalmessage.c
index ec88b57e..60725129 100644
--- a/src/libicalss/icalmessage.c
+++ b/src/libicalss/icalmessage.c
@@ -113,7 +113,7 @@ static icalcomponent *icalmessage_new_reply_base(icalcomponent *c,
         icalcomponent_vanew(
             ICAL_VCALENDAR_COMPONENT, icalproperty_new_method(ICAL_METHOD_REPLY),
             icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-                                icalproperty_new_dtstamp(icaltime_from_timet(time(0), 0)),
+                                icalproperty_new_dtstamp(icaltime_from_timet_with_zone(time(0), 0, NULL)),
                                 0),
             0);
 
@@ -127,7 +127,7 @@ static icalcomponent *icalmessage_new_reply_base(icalcomponent *c,
     icalmessage_copy_properties(reply, c, ICAL_SUMMARY_PROPERTY);
     icalmessage_copy_properties(reply, c, ICAL_SEQUENCE_PROPERTY);
 
-    icalcomponent_set_dtstamp(reply, icaltime_from_timet(time(0), 0));
+    icalcomponent_set_dtstamp(reply, icaltime_from_timet_with_zone(time(0), 0, NULL));
 
     if (msg != 0) {
         icalcomponent_add_property(inner, icalproperty_new_comment(msg));
diff --git a/src/libicalss/icalspanlist.c b/src/libicalss/icalspanlist.c
index f717eff2..da98fa4e 100644
--- a/src/libicalss/icalspanlist.c
+++ b/src/libicalss/icalspanlist.c
@@ -282,9 +282,9 @@ struct icalperiodtype icalspanlist_next_free_time(icalspanlist *sl, struct icalt
         period.start = t;
 
         if (s->is_busy == 1) {
-            period.end = icaltime_from_timet(s->start, 0);
+            period.end = icaltime_from_timet_with_zone(s->start, 0, NULL);
         } else {
-            period.end = icaltime_from_timet(s->end, 0);
+            period.end = icaltime_from_timet_with_zone(s->end, 0, NULL);
         }
 
         return period;
@@ -301,12 +301,12 @@ struct icalperiodtype icalspanlist_next_free_time(icalspanlist *sl, struct icalt
         if (s->is_busy == 0 && s->start >= rangett && (rangett < s->end || s->end == s->start)) {
 
             if (rangett < s->start) {
-                period.start = icaltime_from_timet(s->start, 0);
+                period.start = icaltime_from_timet_with_zone(s->start, 0, NULL);
             } else {
-                period.start = icaltime_from_timet(rangett, 0);
+                period.start = icaltime_from_timet_with_zone(rangett, 0, NULL);
             }
 
-            period.end = icaltime_from_timet(s->end, 0);
+            period.end = icaltime_from_timet_with_zone(s->end, 0, NULL);
 
             return period;
         }
@@ -419,7 +419,7 @@ icalcomponent *icalspanlist_as_vfreebusy(icalspanlist *sl,
 {
     icalcomponent *comp;
     icalproperty *p;
-    struct icaltimetype atime = icaltime_from_timet(time(0), 0);
+    struct icaltimetype atime = icaltime_from_timet_with_zone(time(0), 0, NULL);
     pvl_elem itr;
     icaltimezone *utc_zone;
     icalparameter *param;
diff --git a/src/test/regression-component.c b/src/test/regression-component.c
index 1a42273a..80167b5c 100644
--- a/src/test/regression-component.c
+++ b/src/test/regression-component.c
@@ -89,13 +89,13 @@ void create_new_component()
     icalcomponent *timezone;
     icalcomponent *tzc;
     icalcomponent *event;
-    struct icaltimetype atime = icaltime_from_timet(1023398689, 0);
+    struct icaltimetype atime = icaltime_from_timet_with_zone(1023398689, 0, NULL);
     struct icaldatetimeperiodtype rtime;
     icalproperty *property;
     char *calendar_as_string;
 
-    rtime.period.start = icaltime_from_timet(1023398689, 0);
-    rtime.period.end = icaltime_from_timet(1023409689, 0);
+    rtime.period.start = icaltime_from_timet_with_zone(1023398689, 0, NULL);
+    rtime.period.end = icaltime_from_timet_with_zone(1023409689, 0, NULL);
     rtime.period.end.hour++;
     rtime.time = icaltime_null_time();
 
@@ -215,11 +215,11 @@ void create_new_component()
 void create_new_component_with_va_args()
 {
     icalcomponent *calendar;
-    struct icaltimetype atime = icaltime_from_timet(time(0), 0);
+    struct icaltimetype atime = icaltime_from_timet_with_zone(time(0), 0, NULL);
     struct icaldatetimeperiodtype rtime;
 
-    rtime.period.start = icaltime_from_timet(time(0), 0);
-    rtime.period.end = icaltime_from_timet(time(0), 0);
+    rtime.period.start = icaltime_from_timet_with_zone(time(0), 0, NULL);
+    rtime.period.end = icaltime_from_timet_with_zone(time(0), 0, NULL);
     rtime.period.end.hour++;
     rtime.time = icaltime_null_time();
 
@@ -354,8 +354,8 @@ void test_icalcomponent_get_span()
      */
     c = icalcomponent_vanew(
             ICAL_VEVENT_COMPONENT,
-            icalproperty_vanew_dtstart(icaltime_from_timet(tm1, 0), 0),
-            icalproperty_vanew_dtend(icaltime_from_timet(tm2, 0), 0),
+            icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1, 0, NULL), 0),
+            icalproperty_vanew_dtend(icaltime_from_timet_with_zone(tm2, 0, NULL), 0),
             (void *)0);
 
     span = icalcomponent_get_span(c);
@@ -439,7 +439,7 @@ void test_icalcomponent_get_span()
      */
     c = icalcomponent_vanew(
             ICAL_VEVENT_COMPONENT,
-            icalproperty_new_dtstart(icaltime_from_timet(tm1, 0)),
+            icalproperty_new_dtstart(icaltime_from_timet_with_zone(tm1, 0, NULL)),
             (void *)0);
 
     span = icalcomponent_get_span(c);
@@ -454,8 +454,8 @@ void test_icalcomponent_get_span()
      */
     c = icalcomponent_vanew(
             ICAL_VEVENT_COMPONENT,
-            icalproperty_new_dtstart(icaltime_from_timet(tm1, 1)),
-            icalproperty_new_dtend(icaltime_from_timet(tm1, 1)),
+            icalproperty_new_dtstart(icaltime_from_timet_with_zone(tm1, 1, NULL)),
+            icalproperty_new_dtend(icaltime_from_timet_with_zone(tm1, 1, NULL)),
             (void *)0);
 
     span = icalcomponent_get_span(c);
@@ -469,8 +469,8 @@ void test_icalcomponent_get_span()
      *  We specify start and end date
      */
     c = icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-                            icalproperty_new_dtstart(icaltime_from_timet(tm1, 1)),
-                            icalproperty_new_dtend(icaltime_from_timet(tm2, 1)), (void *)0);
+                            icalproperty_new_dtstart(icaltime_from_timet_with_zone(tm1, 1, NULL)),
+                            icalproperty_new_dtend(icaltime_from_timet_with_zone(tm2, 1, NULL)), (void *)0);
 
     span = icalcomponent_get_span(c);
     int_is("UTC #2", (int)span.start, 973296000);
@@ -483,7 +483,7 @@ void test_icalcomponent_get_span()
      *  We specify start date
      */
     c = icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-                            icalproperty_new_dtstart(icaltime_from_timet(tm1, 1)), (void *)0);
+                            icalproperty_new_dtstart(icaltime_from_timet_with_zone(tm1, 1, NULL)), (void *)0);
 
     span = icalcomponent_get_span(c);
     if (VERBOSE)
diff --git a/src/test/regression-recur.c b/src/test/regression-recur.c
index 8652169c..f2a351d3 100644
--- a/src/test/regression-recur.c
+++ b/src/test/regression-recur.c
@@ -114,7 +114,7 @@ void test_recur_file()
         char msg[128];
 
         struct icaltimetype start;
-        struct icaltimetype startmin = icaltime_from_timet(1, 0);
+        struct icaltimetype startmin = icaltime_from_timet_with_zone(1, 0, NULL);
         struct icaltimetype endmax = icaltime_null_time();
         const char *desc_str = "malformed component";
 
diff --git a/src/test/regression-storage.c b/src/test/regression-storage.c
index 0d356c49..f7094285 100644
--- a/src/test/regression-storage.c
+++ b/src/test/regression-storage.c
@@ -140,7 +140,7 @@ void test_fileset_extended(void)
     icalcomponent *c, *clone, *itr;
     icalsetiter iter;
 
-    start = icaltime_from_timet(time(0), 0);
+    start = icaltime_from_timet_with_zone(time(0), 0, NULL);
     end = start;
     end.hour++;
 
@@ -305,7 +305,7 @@ void test_bdbset()
 
     return;     // for now... TODO fix these broken tests..
 
-    start = icaltime_from_timet(time(0), 0);
+    start = icaltime_from_timet_with_zone(time(0), 0, NULL);
     end = start;
     end.hour++;
 
@@ -636,7 +636,7 @@ void test_dirset_extended(void)
     ok("Open dirset 'store'", (s != 0));
     assert(s != 0);
 
-    rtime.start = icaltime_from_timet(time(0), 0);
+    rtime.start = icaltime_from_timet_with_zone(time(0), 0, NULL);
 
     cluster = icalfileset_new(OUTPUT_FILE);
 
diff --git a/src/test/regression.c b/src/test/regression.c
index 9c87dd86..9c399adb 100644
--- a/src/test/regression.c
+++ b/src/test/regression.c
@@ -215,9 +215,9 @@ void test_values()
     icalvalue_free(v);
     icalvalue_free(copy);
 
-    v = icalvalue_new_date(icaltime_from_timet(1023404802, 0));
+    v = icalvalue_new_date(icaltime_from_timet_with_zone(1023404802, 0, NULL));
     str_is("icalvalue_new_date()", icalvalue_as_ical_string(v), "20020606T230642");
-    icalvalue_set_date(v, icaltime_from_timet(1023404802 - 3600, 0));
+    icalvalue_set_date(v, icaltime_from_timet_with_zone(1023404802 - 3600, 0, NULL));
     str_is("icalvalue_set_date()", icalvalue_as_ical_string(v), "20020606T220642");
 
     copy = icalvalue_new_clone(v);
@@ -709,7 +709,7 @@ void test_dirset()
     ok("opening 'store' dirset", s != NULL);
     ok("opening 'store-new' dirset", s2 != NULL);
 
-    rtime.start = icaltime_from_timet(time(0), 0);
+    rtime.start = icaltime_from_timet_with_zone(time(0), 0, NULL);
 
     cluster = icalfileset_new("clusterin.vcd");
 
@@ -867,13 +867,13 @@ void test_compare()
 void test_restriction()
 {
     icalcomponent *comp;
-    struct icaltimetype atime = icaltime_from_timet(time(0), 0);
+    struct icaltimetype atime = icaltime_from_timet_with_zone(time(0), 0, NULL);
     int valid;
 
     struct icaldatetimeperiodtype rtime;
 
-    rtime.period.start = icaltime_from_timet(time(0), 0);
-    rtime.period.end = icaltime_from_timet(time(0), 0);
+    rtime.period.start = icaltime_from_timet_with_zone(time(0), 0, NULL);
+    rtime.period.end = icaltime_from_timet_with_zone(time(0), 0, NULL);
     rtime.period.end.hour++;
     rtime.time = icaltime_null_time();
 
@@ -945,7 +945,7 @@ void test_calendar()
     icalset *s;
     icalcalendar *calendar;
     icalerrorenum error;
-    struct icaltimetype atime = icaltime_from_timet(time(0), 0);
+    struct icaltimetype atime = icaltime_from_timet_with_zone(time(0), 0, NULL);
 
     (void)mkdir("calendar", 0755);
     (void)mkdir("calendar/booked", 0755);
@@ -1085,7 +1085,7 @@ void icalrecurrencetype_test()
             "FREQ=YEARLY;UNTIL=20060101T000000;INTERVAL=2;BYDAY=SU,WE;BYSECOND=15,30; BYMONTH=1,6,11");
 
     struct icalrecurrencetype r = icalvalue_get_recur(v);
-    struct icaltimetype t = icaltime_from_timet(time(0), 0);
+    struct icaltimetype t = icaltime_from_timet_with_zone(time(0), 0, NULL);
     struct icaltimetype next;
     time_t tt;
 
@@ -1488,14 +1488,6 @@ void do_test_time(const char *zone)
     if (VERBOSE) {
         printf("Orig        : %s\n", ical_timet_string(tt));
     }
-    if (VERBOSE) {
-        printf("\nicaltime_from_timet(tt,0) (DEPRECATED)\n");
-    }
-
-    ictt = icaltime_from_timet(tt, 0);
-
-    str_is("icaltime_from_timet(1025127869) as UTC", ictt_as_string(ictt),
-           "2002-06-26 21:44:29 (floating)");
 
     ictt = icaltime_from_timet_with_zone(tt, 0, NULL);
     str_is("Floating time from time_t", ictt_as_string(ictt), "2002-06-26 21:44:29 (floating)");
@@ -1988,8 +1980,8 @@ void test_overlaps()
     set = icalset_new(ICAL_FILE_SET, TEST_DATADIR "/overlaps.ics", &options);
 
     c = icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-                            icalproperty_vanew_dtstart(icaltime_from_timet(tm1 - hh, 0), (void *)0),
-                            icalproperty_vanew_dtend(icaltime_from_timet(tm2 - hh, 0), (void *)0),
+                            icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1 - hh, 0, NULL), (void *)0),
+                            icalproperty_vanew_dtend(icaltime_from_timet_with_zone(tm2 - hh, 0, NULL), (void *)0),
                             0);
 
     cset = icalclassify_find_overlaps(set, c);
@@ -2009,8 +2001,8 @@ void test_overlaps()
 
     c = icalcomponent_vanew(
             ICAL_VEVENT_COMPONENT,
-            icalproperty_vanew_dtstart(icaltime_from_timet(tm1 - hh, 0), (void *)0),
-            icalproperty_vanew_dtend(icaltime_from_timet(tm2, 0), (void *)0),
+            icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1 - hh, 0, NULL), (void *)0),
+            icalproperty_vanew_dtend(icaltime_from_timet_with_zone(tm2, 0, NULL), (void *)0),
             0);
 
     cset = icalclassify_find_overlaps(set, c);
@@ -2029,8 +2021,8 @@ void test_overlaps()
 
     c = icalcomponent_vanew(
             ICAL_VEVENT_COMPONENT,
-            icalproperty_vanew_dtstart(icaltime_from_timet(tm1 + 5 * hh, 0), (void *)0),
-            icalproperty_vanew_dtend(icaltime_from_timet(tm2 + 5 * hh, 0), (void *)0),
+            icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1 + 5 * hh, 0, NULL), (void *)0),
+            icalproperty_vanew_dtend(icaltime_from_timet_with_zone(tm2 + 5 * hh, 0, NULL), (void *)0),
             0);
 
     cset = icalclassify_find_overlaps(set, c);