From fee5916b60c605ff5086d8fdc2a85c5ea21351f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 31 Jan 2009 19:03:12 +0000 Subject: Merge revisions 37108:37199 from trunk. svn path=/branches/kill-bonobo/; revision=37200 --- plugins/save-calendar/ChangeLog | 42 +++++++++++++++++++++++++++++++++++++ plugins/save-calendar/ical-format.c | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) (limited to 'plugins/save-calendar') diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog index d8e69aac67..28e5ad77e1 100644 --- a/plugins/save-calendar/ChangeLog +++ b/plugins/save-calendar/ChangeLog @@ -1,3 +1,45 @@ +2009-01-21 Suman Manjunath + + ** Fix for bug #541209 + + ** Adapt to the new APIs from upstream libical. Changes made include + using the "_r" counterpart for the following APIs: + + icalproperty_as_ical_string () + + icalvalue_as_ical_string () + + icalcomponent_as_ical_string () + + icalparameter_as_ical_string () + + icaldurationtype_as_ical_string () + + icalenum_reqstat_code () + + icallangbind_property_eval_string () + + icallangbind_quote_as_ical () + + icalmime_text_end_part () + + icalperiodtype_as_ical_string () + + icalproperty_enum_to_string () + + icalproperty_get_parameter_as_string () + + icalproperty_get_value_as_string () + + icalproperty_get_property_name () + + icalrecurrencetype_as_string () + + icaltime_as_ical_string () + + icalreqstattype_as_string () + + icalvalue_binary_as_ical_string () + + icalvalue_int_as_ical_string () + + icalvalue_utcoffset_as_ical_string () + + icalvalue_string_as_ical_string () + + icalvalue_recur_as_ical_string () + + icalvalue_text_as_ical_string () + + icalvalue_attach_as_ical_string () + + icalvalue_duration_as_ical_string () + + icalvalue_date_as_ical_string () + + icalvalue_datetime_as_ical_string () + + icalvalue_float_as_ical_string () + + icalvalue_geo_as_ical_string () + + icalvalue_datetimeperiod_as_ical_string () + + icalvalue_period_as_ical_string () + + icalvalue_trigger_as_ical_string () + + icalvalue_as_ical_string () + + * ical-format.c (do_save_calendar_ical): + 2008-09-16 Sankar P License Changes diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index 1b7ccfb7b1..a537bf4641 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -136,7 +136,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), dest_uri, &error); if (stream) { - char *ical_str = icalcomponent_as_ical_string (top_level); + char *ical_str = icalcomponent_as_ical_string_r (top_level); g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error); g_output_stream_close (stream, NULL, NULL); -- cgit v1.2.3