aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog60
-rw-r--r--calendar/gui/dialogs/e-send-options-utils.c2
-rw-r--r--calendar/gui/e-cal-model.c2
-rw-r--r--calendar/gui/e-calendar-table.c4
-rw-r--r--calendar/gui/e-calendar-view.c6
-rw-r--r--calendar/gui/e-day-view.c10
-rw-r--r--calendar/gui/e-itip-control.c2
-rw-r--r--calendar/gui/e-memo-table.c4
-rw-r--r--calendar/gui/e-memos.c2
-rw-r--r--calendar/gui/e-tasks.c2
-rw-r--r--calendar/gui/e-week-view.c8
-rw-r--r--calendar/gui/gnome-cal.c2
-rw-r--r--calendar/gui/itip-utils.c8
13 files changed, 86 insertions, 26 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a20e6978f9..2b7f4ec612 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,63 @@
+2009-01-21 Suman Manjunath <msuman@novell.com>
+
+ ** 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 ()
+
+ * gui/dialogs/e-send-options-utils.c
+ (e_sendoptions_utils_fill_component):
+ * gui/e-cal-model.c (search_by_id_and_client):
+ * gui/e-calendar-table.c (copy_row_cb),
+ (e_calendar_table_copy_clipboard):
+ * gui/e-calendar-view.c (e_calendar_view_copy_clipboard),
+ (transfer_item_to), (icalcomp_contains_category):
+ * gui/e-day-view.c (update_row), (model_comps_deleted_cb),
+ (e_day_view_find_event_from_uid), (e_day_view_reshape_day_events),
+ (e_day_view_on_drag_data_get):
+ * gui/e-itip-control.c (update_item):
+ * gui/e-memo-table.c (copy_row_cb), (e_memo_table_copy_clipboard):
+ * gui/e-memos.c (obtain_list_of_components):
+ * gui/e-tasks.c (obtain_list_of_components):
+ * gui/e-week-view.c (update_row), (model_comps_deleted_cb),
+ (e_week_view_reshape_events), (e_week_view_find_event_from_uid):
+ * gui/gnome-cal.c (gnome_calendar_purge):
+ * gui/itip-utils.c (comp_limit_attendees), (itip_send_comp),
+ (reply_to_calendar_comp), (itip_publish_comp):
+
2009-01-20 Milan Crha <mcrha@redhat.com>
** Fix for bug #353460
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index fde53ca336..52f73aed02 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -192,7 +192,7 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp
icaltimezone *zone = calendar_config_get_icaltimezone ();
temp = icaltime_from_timet_with_zone (gopts->delay_until, FALSE, zone);
- str = icaltime_as_ical_string (temp);
+ str = icaltime_as_ical_string_r (temp);
prop = icalproperty_new_x (str);
g_free (str);
icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-DELAY");
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index f834007003..63e840ccb1 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1338,7 +1338,7 @@ search_by_id_and_client (ECalModelPrivate *priv, ECal *client, const ECalCompone
gboolean has_rid = (id->rid && *id->rid);
uid = icalcomponent_get_uid (comp_data->icalcomp);
- rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+ rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
if (uid && *uid) {
if ((!client || comp_data->client == client) && !strcmp (id->uid, uid)) {
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index a534e8ed3f..dec81a0f07 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1093,7 +1093,7 @@ copy_row_cb (int model_row, gpointer data)
e_cal_util_add_timezones_from_component (cal_table->tmp_vcal, comp_data->icalcomp);
/* add the new component to the VCALENDAR component */
- comp_str = icalcomponent_as_ical_string (comp_data->icalcomp);
+ comp_str = icalcomponent_as_ical_string_r (comp_data->icalcomp);
child = icalparser_parse_string (comp_str);
if (child) {
icalcomponent_add_component (cal_table->tmp_vcal,
@@ -1123,7 +1123,7 @@ e_calendar_table_copy_clipboard (ECalendarTable *cal_table)
etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable));
e_table_selected_row_foreach (etable, copy_row_cb, cal_table);
- comp_str = icalcomponent_as_ical_string (cal_table->tmp_vcal);
+ comp_str = icalcomponent_as_ical_string_r (cal_table->tmp_vcal);
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (cal_table), clipboard_atom);
if (!gtk_clipboard_set_with_data(clipboard, target_types, n_target_types,
clipboard_get_calendar_cb,
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index e315ad5218..98edbb7d3e 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -790,7 +790,7 @@ e_calendar_view_copy_clipboard (ECalendarView *cal_view)
/* copy the VCALENDAR to the clipboard */
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (cal_view), GDK_SELECTION_CLIPBOARD);
- comp_str = icalcomponent_as_ical_string (vcal_comp);
+ comp_str = icalcomponent_as_ical_string_r (vcal_comp);
if (!gtk_clipboard_set_with_data (clipboard, target_types, n_target_types,
clipboard_get_calendar_cb,
@@ -1405,7 +1405,7 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_
struct icaltimetype recur_id = icalcomponent_get_recurrenceid (event->comp_data->icalcomp);
if (!icaltime_is_null_time (recur_id))
- rid = icaltime_as_ical_string (recur_id);
+ rid = icaltime_as_ical_string_r (recur_id);
e_cal_remove_object_with_mod (event->comp_data->client, uid, rid, CALOBJ_MOD_ALL, NULL);
g_free (rid);
@@ -2506,7 +2506,7 @@ icalcomp_contains_category (icalcomponent *icalcomp, const gchar *category)
for (property = icalcomponent_get_first_property (icalcomp, ICAL_CATEGORIES_PROPERTY);
property != NULL;
property = icalcomponent_get_next_property (icalcomp, ICAL_CATEGORIES_PROPERTY)) {
- char *value = icalproperty_get_value_as_string (property);
+ char *value = icalproperty_get_value_as_string_r (property);
if (value && strcmp (category, value) == 0){
g_free (value);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index d60fd1e5c2..523cf45afd 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -564,7 +564,7 @@ update_row (EDayView *day_view, int row)
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
if (prop)
- rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+ rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
}
if (e_day_view_find_event_from_uid (day_view, comp_data->client, uid, rid, &day, &event_num))
@@ -658,7 +658,7 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
if (prop)
- rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+ rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
}
if (e_day_view_find_event_from_uid (day_view, comp_data->client, uid, rid, &day, &event_num))
@@ -1993,7 +1993,7 @@ e_day_view_find_event_from_uid (EDayView *day_view,
u = icalcomponent_get_uid (event->comp_data->icalcomp);
if (u && !strcmp (uid, u)) {
if (rid && *rid) {
- r = icaltime_as_ical_string (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
+ r = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
if (!r || !*r)
continue;
if (strcmp (rid, r) != 0) {
@@ -4586,7 +4586,7 @@ e_day_view_reshape_day_events (EDayView *day_view,
e_day_view_reshape_day_event (day_view, day, event_num);
event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
- current_comp_string = icalcomponent_as_ical_string (event->comp_data->icalcomp);
+ current_comp_string = icalcomponent_as_ical_string_r (event->comp_data->icalcomp);
if (day_view->last_edited_comp_string == NULL) {
g_free (current_comp_string);
continue;
@@ -7364,7 +7364,7 @@ e_day_view_on_drag_data_get (GtkWidget *widget,
e_cal_util_add_timezones_from_component (vcal, event->comp_data->icalcomp);
icalcomponent_add_component (vcal, icalcomponent_new_clone (event->comp_data->icalcomp));
- comp_str = icalcomponent_as_ical_string (vcal);
+ comp_str = icalcomponent_as_ical_string_r (vcal);
if (comp_str) {
gtk_selection_data_set (selection_data, selection_data->target,
8, (unsigned char *)comp_str, strlen (comp_str));
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index ff6aeb92ba..03001cc3d9 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -1950,7 +1950,7 @@ update_item (EItipControl *itip)
* and you then look at it in Outlook).
*/
stamp = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
- str = icaltime_as_ical_string (stamp);
+ str = icaltime_as_ical_string_r (stamp);
prop = icalproperty_new_x (str);
g_free (str);
icalproperty_set_x_name (prop, "X-MICROSOFT-CDO-REPLYTIME");
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index c5f39c9ed9..63a43c4e9d 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -546,7 +546,7 @@ copy_row_cb (int model_row, gpointer data)
e_cal_util_add_timezones_from_component (memo_table->tmp_vcal, comp_data->icalcomp);
/* add the new component to the VCALENDAR component */
- comp_str = icalcomponent_as_ical_string (comp_data->icalcomp);
+ comp_str = icalcomponent_as_ical_string_r (comp_data->icalcomp);
child = icalparser_parse_string (comp_str);
if (child) {
icalcomponent_add_component (memo_table->tmp_vcal,
@@ -596,7 +596,7 @@ e_memo_table_copy_clipboard (EMemoTable *memo_table)
etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (memo_table->etable));
e_table_selected_row_foreach (etable, copy_row_cb, memo_table);
- comp_str = icalcomponent_as_ical_string (memo_table->tmp_vcal);
+ comp_str = icalcomponent_as_ical_string_r (memo_table->tmp_vcal);
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (memo_table), clipboard_atom);
if (!gtk_clipboard_set_with_data(clipboard, target_types, n_target_types,
clipboard_get_calendar_cb,
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 89c9c8ad1e..fa92195121 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -405,7 +405,7 @@ obtain_list_of_components (gpointer data, gpointer user_data)
e_cal_util_add_timezones_from_component (vcal, comp_data->icalcomp);
icalcomponent_add_component (vcal, icalcomponent_new_clone (comp_data->icalcomp));
- comp_str = icalcomponent_as_ical_string (vcal);
+ comp_str = icalcomponent_as_ical_string_r (vcal);
if (comp_str) {
ESource *source = e_cal_get_source (comp_data->client);
const char *source_uid = e_source_peek_uid (source);
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index fad9d6d300..1483a06203 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -502,7 +502,7 @@ obtain_list_of_components (gpointer data, gpointer user_data)
e_cal_util_add_timezones_from_component (vcal, comp_data->icalcomp);
icalcomponent_add_component (vcal, icalcomponent_new_clone (comp_data->icalcomp));
- comp_str = icalcomponent_as_ical_string (vcal);
+ comp_str = icalcomponent_as_ical_string_r (vcal);
if (comp_str) {
ESource *source = e_cal_get_source (comp_data->client);
const char *source_uid = e_source_peek_uid (source);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 198f31ce6b..f5c2577b8f 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -350,7 +350,7 @@ update_row (EWeekView *week_view, int row)
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
if (prop)
- rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+ rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
}
if (e_week_view_find_event_from_uid (week_view, comp_data->client, uid, rid, &event_num))
@@ -440,7 +440,7 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
if (prop)
- rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+ rid = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (comp_data->icalcomp));
}
if (e_week_view_find_event_from_uid (week_view, comp_data->client, uid, rid, &event_num))
@@ -2565,7 +2565,7 @@ e_week_view_reshape_events (EWeekView *week_view)
span_num);
if (week_view->last_edited_comp_string == NULL)
continue;
- current_comp_string = icalcomponent_as_ical_string (event->comp_data->icalcomp);
+ current_comp_string = icalcomponent_as_ical_string_r (event->comp_data->icalcomp);
if (strncmp (current_comp_string, week_view->last_edited_comp_string,50) == 0) {
EWeekViewEventSpan *span;
span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
@@ -3715,7 +3715,7 @@ e_week_view_find_event_from_uid (EWeekView *week_view,
u = icalcomponent_get_uid (event->comp_data->icalcomp);
if (u && !strcmp (uid, u)) {
if (rid && *rid) {
- r = icaltime_as_ical_string (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
+ r = icaltime_as_ical_string_r (icalcomponent_get_recurrenceid (event->comp_data->icalcomp));
if (!r || !*r)
continue;
if (strcmp (rid, r) != 0) {
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 76b43b8e5b..3b08f16390 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -4020,7 +4020,7 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
struct icaltimetype recur_id = icalcomponent_get_recurrenceid (m->data);
if (!icaltime_is_null_time (recur_id) )
- rid = icaltime_as_ical_string (recur_id);
+ rid = icaltime_as_ical_string_r (recur_id);
e_cal_remove_object_with_mod (client, uid, rid, CALOBJ_MOD_ALL, &error);
g_free (rid);
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 58df85a9d2..5bd4452154 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -859,7 +859,7 @@ comp_limit_attendees (ECalComponent *comp)
continue;
}
- attendee = icalproperty_get_value_as_string (prop);
+ attendee = icalproperty_get_value_as_string_r (prop);
if (!attendee)
continue;
@@ -1256,7 +1256,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
content_type = comp_content_type (comp, method);
top_level = comp_toplevel_with_zones (method, comp, client, zones);
- ical_string = icalcomponent_as_ical_string (top_level);
+ ical_string = icalcomponent_as_ical_string_r (top_level);
if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT) {
e_msg_composer_set_body (composer, ical_string, content_type);
@@ -1361,7 +1361,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
e_destination_freev (destinations);
top_level = comp_toplevel_with_zones (method, comp, client, zones);
- ical_string = icalcomponent_as_ical_string (top_level);
+ ical_string = icalcomponent_as_ical_string_r (top_level);
if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT){
@@ -1671,7 +1671,7 @@ itip_publish_comp (ECal *client, gchar *uri, gchar *username,
}
soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT);
- ical_string = icalcomponent_as_ical_string (toplevel);
+ ical_string = icalcomponent_as_ical_string_r (toplevel);
soup_message_set_request (msg, "text/calendar", SOUP_MEMORY_TEMPORARY,
ical_string, strlen (ical_string));
generated by cgit (git 2.34.1) at 2024-11-19 10:56:01 +0800