We no longer need time_from_icaltimetype as libical has the API for this

2000-08-28  JP Rosevear  <jpr@helixcode.com>

	* cal-util/timeutil.h: We no longer need time_from_icaltimetype
	as libical has the API for this

	* cal-util/timeutil.c: ditto

	* cal-util/cal-recur.c: Replace time_from_icaltimetype with
	icaltime_as_timet

	* gui/calendar-model.c: ditto

	* gui/event-editor.c: ditto

	* gui/gnome-cal.c: ditto

svn path=/trunk/; revision=5090

3 files changed, 10 insertions, 10 deletions

diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index 9be00485b3..135f770863 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -353,7 +353,7 @@ get_completed (CalComponent *comp)
 	if (!completed)
 		t = 0;
 	else {
-		t = time_from_icaltimetype (*completed);
+		t = icaltime_as_timet (*completed);
 		cal_component_free_icaltimetype (completed);
 	}
 
@@ -369,7 +369,7 @@ get_and_free_datetime (CalComponentDateTime dt)
 	if (!dt.value)
 		t = 0;
 	else
-		t = time_from_icaltimetype (*dt.value);
+		t = icaltime_as_timet (*dt.value);
 
 	cal_component_free_datetime (&dt);
 
@@ -599,7 +599,7 @@ get_is_overdue (CalComponent *comp)
 		 * really overdue?
 		 **/
 
-		t = time_from_icaltimetype (*dt.value);
+		t = icaltime_as_timet (*dt.value);
 
 		if (t < time (NULL))
 			retval = TRUE;
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index 4e3d08e362..d29b67b7fd 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -723,9 +723,9 @@ fill_widgets (EventEditor *ee)
 	   3rd Feb as the end date, since it really ends at midnight on 3rd,
 	   so we have to subtract a day so we only show the 2nd. */
 	cal_component_get_dtstart (priv->comp, &d);
-	dtstart = time_from_icaltimetype (*d.value);
+	dtstart = icaltime_as_timet (*d.value);
 	cal_component_get_dtend (priv->comp, &d);
-	dtend = time_from_icaltimetype (*d.value);
+	dtend = icaltime_as_timet (*d.value);
 	if (time_day_begin (dtstart) == dtstart
 	    && time_day_begin (dtend) == dtend) {
 		dtend = time_add_day (dtend, -1);
@@ -885,7 +885,7 @@ fill_widgets (EventEditor *ee)
 						   r->count);
 			}
 		} else {
-			time_t t = time_from_icaltimetype (r->until);
+			time_t t = icaltime_as_timet (r->until);
 			e_dialog_toggle_set (priv->recurrence_ending_date_end_on, TRUE);
 			/* Shorten by one day, as we store end-on date a day ahead */
 			/* FIXME is this correct? */
@@ -906,7 +906,7 @@ fill_widgets (EventEditor *ee)
 		time_t ext;
 		
 		t = l->data;
-		ext = time_from_icaltimetype (*t);
+		ext = icaltime_as_timet (*t);
 		append_exception (ee, ext);
 	}
 	cal_component_free_exdate_list (list);
diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c
index f81cc24740..3bd6839962 100644
--- a/calendar/gui/gncal-todo.c
+++ b/calendar/gui/gncal-todo.c
@@ -217,7 +217,7 @@ gncal_todo_edit (CalClient *client, CalComponent *comp)
 
 	due_entry = gtk_entry_new ();
 	cal_component_get_dtend (comp, &date);
-	d = time_from_icaltimetype (*date.value);
+	d = icaltime_as_timet (*date.value);
 	due_entry = date_edit_new (d, TRUE);
 	gtk_box_pack_start (GTK_BOX (due_box), due_entry, TRUE, TRUE, 0);
 	gtk_widget_show (due_entry);
@@ -717,7 +717,7 @@ insert_in_clist (GncalTodo *todo, CalComponent *comp)
 	  
 	  /* for right now all I'll do is up to the hours. */
 	  cal_component_get_dtend (comp, &date);
-	  time_remain = time_from_icaltimetype (*date.value) - time (NULL);
+	  time_remain = icaltime_as_timet (*date.value) - time (NULL);
 	  if(time_remain < 0) {
 	    text[3] = "Overdue!";
 	  }
@@ -799,7 +799,7 @@ insert_in_clist (GncalTodo *todo, CalComponent *comp)
 	 */
 
 	cal_component_get_dtend (comp, &date);
-	d = time_from_icaltimetype (*date.value);
+	d = icaltime_as_timet (*date.value);
 	if(todo_show_due_date)
 	  {
 	    text[1] = convert_time_t_to_char (d);