Re: [evolution-patches] patch for #70035 (calendar)

[Rodrigo Moya <rodrigo novell com>]

On Fri, 2005-04-01 at 14:01 -0500, JP Rosevear wrote:
> On Fri, 2005-04-01 at 11:09 +0200, Rodrigo Moya wrote:
> > On Fri, 2005-04-01 at 10:45 +0200, Rodrigo Moya wrote:
> > > On Fri, 2005-04-01 at 00:29 -0500, JP Rosevear wrote:
> > > > 
> > > > > Attached patch makes the importer do the same. About other parts, what
> > > > > else should be using it?
> > > > 
> > > > This is my worry doing it this way - we won't find all the bits :-).
> > > > 
> > > well, the bug was just about the HTTP backend, I haven't seen any other
> > > similar bug for other parts, so if they ever appear, they can be easily
> > > fixed by getting the new function used.
> > 
> > also, changing it in icalparser_parse_string, which is used everywhere,
> > might add some bugs that might affect other parts, so hence another
> > reason to not change it there, at least for 2.2.x
> 
> Risky either way I suppose.  I see a couple of solutions:
> 
> 1) save this work for 2.2.3 and move it lower in the stack
> 2) Use your current patch for 2.2.2 and fix it lower in 2.3
> 
I would opt for 2

> I think DnD/CCP might need to use the function as well.
> 
ok, attached patch adds that. Only sending the evo one, e-d-s is still
the same as before.
-- 
Rodrigo Moya <rodrigo novell com>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2680.2.14
diff -u -p -r1.2680.2.14 ChangeLog
--- ChangeLog	28 Mar 2005 11:28:53 -0000	1.2680.2.14
+++ ChangeLog	3 Apr 2005 10:30:12 -0000
@@ -1,3 +1,13 @@
+2005-03-xx  Rodrigo Moya <rodrigo novell com>
+
+	Fixes #70035
+
+	* gui/e-calendar-view.c (clipboard_get_text_cb):
+	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received,
+	e_day_view_on_main_canvas_drag_data_received):
+	* importers/icalendar-importer.c (support_format_fn, load_file_fn):
+	use e_cal_util_parse_ics_string instead of icalparser_parse_string.
+
 2005-03-28  Rodrigo Moya <rodrigo novell com>
 
 	Fixes #44719
Index: gui/e-calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.c,v
retrieving revision 1.76.2.1
diff -u -p -r1.76.2.1 e-calendar-view.c
--- gui/e-calendar-view.c	16 Mar 2005 10:12:35 -0000	1.76.2.1
+++ gui/e-calendar-view.c	3 Apr 2005 10:30:13 -0000
@@ -740,7 +740,7 @@ clipboard_get_text_cb (GtkClipboard *cli
 	if (!text || !*text)
 		return;
 
-	icalcomp = icalparser_parse_string ((const char *) text);
+	icalcomp = e_cal_util_parse_ics_string ((const char *) text);
 	if (!icalcomp)
 		return;
 
Index: gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.268.2.2
diff -u -p -r1.268.2.2 e-day-view.c
--- gui/e-day-view.c	16 Mar 2005 10:12:35 -0000	1.268.2.2
+++ gui/e-day-view.c	3 Apr 2005 10:30:17 -0000
@@ -7169,7 +7169,7 @@ e_day_view_on_top_canvas_drag_data_recei
 			goto error;
 
 		comp_str = (char *) data->data;
-		icalcomp = icalparser_parse_string ((const char *) comp_str);
+		icalcomp = e_cal_util_parse_ics_string ((const char *) comp_str);
 		if (!icalcomp)
 			goto error;
 
@@ -7360,7 +7360,7 @@ e_day_view_on_main_canvas_drag_data_rece
 			goto error;
 
 		comp_str = (char *) data->data;
-		icalcomp = icalparser_parse_string ((const char *) comp_str);
+		icalcomp = e_cal_util_parse_ics_string ((const char *) comp_str);
 		if (!icalcomp)
 			goto error;
 
Index: importers/icalendar-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/importers/icalendar-importer.c,v
retrieving revision 1.39
diff -u -p -r1.39 icalendar-importer.c
--- importers/icalendar-importer.c	19 Jan 2005 16:28:34 -0000	1.39
+++ importers/icalendar-importer.c	3 Apr 2005 10:30:17 -0000
@@ -362,7 +362,7 @@ support_format_fn (EvolutionImporter *im
 
 	if (g_file_get_contents (filename, &contents, NULL, NULL)) {
 		/* parse the file */
-		icalcomp = icalparser_parse_string (contents);
+		icalcomp = e_cal_util_parse_ics_string (contents);
 		g_free (contents);
 
 		if (icalcomp) {
@@ -392,7 +392,7 @@ load_file_fn (EvolutionImporter *importe
 		icalcomponent *icalcomp;
 
 		/* parse the file */
-		icalcomp = icalparser_parse_string (contents);
+		icalcomp = e_cal_util_parse_ics_string (contents);
 		g_free (contents);
 		
 		if (icalcomp) {