From 405a128ebd06be4a3628c4aa2413c8c44d07d7c6 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 5 Jan 2005 11:40:08 +0000 Subject: added a new argument to pass the calendar client, since it might happen to 2005-01-05 Rodrigo Moya * gui/e-day-view.c (e_day_view_find_event_from_uid): added a new argument to pass the calendar client, since it might happen to have events with the same UID on different calendars. (e_day_view_do_key_press, model_rows_deleted_cb): added new argument to e_day_view_find_event_from_uid. * gui/e-week-view.c (e_week_view_find_event_from_uid): same as e-day-view.c. (e_week_view_do_key_press, model_rows_deleted_cb): added new argument to e_week_view_find_event_from_uid. svn path=/trunk/; revision=28245 --- calendar/gui/e-day-view.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'calendar/gui/e-day-view.c') diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index e350279cbb..f675d797ad 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -285,6 +285,7 @@ static ECalendarViewPosition e_day_view_convert_position_in_main_canvas (EDayVie gint *row_return, gint *event_num_return); static gboolean e_day_view_find_event_from_uid (EDayView *day_view, + ECal *client, const gchar *uid, const gchar *rid, gint *day_return, @@ -622,7 +623,7 @@ model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data) rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp)); } - if (e_day_view_find_event_from_uid (day_view, uid, rid, &day, &event_num)) + if (e_day_view_find_event_from_uid (day_view, comp_data->client, uid, rid, &day, &event_num)) e_day_view_remove_event_cb (day_view, day, event_num, NULL); } @@ -1908,6 +1909,7 @@ e_day_view_find_event_from_item (EDayView *day_view, see if any events with the uid exist. */ static gboolean e_day_view_find_event_from_uid (EDayView *day_view, + ECal *client, const gchar *uid, const gchar *rid, gint *day_return, @@ -1926,6 +1928,9 @@ e_day_view_find_event_from_uid (EDayView *day_view, event = &g_array_index (day_view->events[day], EDayViewEvent, event_num); + if (event->comp_data->client != client) + continue; + u = icalcomponent_get_uid (event->comp_data->icalcomp); if (u && !strcmp (uid, u)) { if (rid && *rid) { @@ -4812,7 +4817,7 @@ e_day_view_do_key_press (GtkWidget *widget, GdkEventKey *event) gtk_widget_queue_draw (day_view->top_canvas); gtk_widget_queue_draw (day_view->main_canvas); - if (e_day_view_find_event_from_uid (day_view, uid, NULL, &day, &event_num)) { + if (e_day_view_find_event_from_uid (day_view, ecal, uid, NULL, &day, &event_num)) { e_day_view_start_editing_event (day_view, day, event_num, initial_text); } else { -- cgit v1.2.3