This commit was manufactured by cvs2svn to create tagEVOLUTION_1_2_4

'EVOLUTION_1_2_4'.

svn path=/tags/EVOLUTION_1_2_4/; revision=20614

1 files changed, 2 insertions, 28 deletions

diff --git a/calendar/cal-util/cal-util.c b/calendar/cal-util/cal-util.c
index ad495bca77..bb89c043b4 100644
--- a/calendar/cal-util/cal-util.c
+++ b/calendar/cal-util/cal-util.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 #include "cal-util.h"
@@ -102,33 +103,6 @@ cal_util_new_top_level (void)
 	return icalcomp;
 }
 
-static char *
-get_line_fn (char *buf, size_t size, void *file)
-{
-	return fgets (buf, size, file);
-}
-
-icalcomponent *
-cal_util_parse_ics_file (const char *filename)
-{
-	icalparser *parser;
-	icalcomponent *icalcomp;
-	FILE *file;
-
-	file = fopen (filename, "r");
-	if (!file)
-		return NULL;
-
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, file);
-
-	icalcomp = icalparser_parse (parser, get_line_fn);
-	icalparser_free (parser);
-	fclose (file);
-
-	return icalcomp;
-}
-
 /* Computes the range of time in which recurrences should be generated for a
  * component in order to compute alarm trigger times.
  */
@@ -483,7 +457,7 @@ cal_util_generate_alarms_for_comp (CalComponent *comp,
 
 	alarms = g_new (CalComponentAlarms, 1);
 	alarms->comp = comp;
-	g_object_ref (G_OBJECT (alarms->comp));
+	gtk_object_ref (GTK_OBJECT (alarms->comp));
 	alarms->alarms = g_slist_sort (aod.triggers, compare_alarm_instance);
 
 	return alarms;