diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
| commit | c0a255eb90769638d57ae4122932f75c46e4e531 (patch) | |
| tree | 5213694107a246763c25c0a089553dd7c8708b32 /calendar/gui/e-day-view.c | |
| parent | 4c8aa5982c0132716f473873d0e1d7601df14607 (diff) | |
| download | gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.gz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.zst gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.zip | |
Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
Diffstat (limited to 'calendar/gui/e-day-view.c')
| -rw-r--r-- | calendar/gui/e-day-view.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index ebf17eff78..f1fb84cd3c 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -624,10 +624,10 @@ model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data } static void -model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data) +model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data) { EDayView *day_view = E_DAY_VIEW (user_data); - int i; + GSList *l, *list = data; if (!E_CALENDAR_VIEW (day_view)->in_focus) { return; @@ -635,15 +635,12 @@ model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data) e_day_view_stop_editing_event (day_view); - for (i = row + count; i > row; i--) { + for (l = list; l != NULL; l = g_slist_next (l)) { + ECalModelComponent *comp_data = l->data; gint day, event_num; const char *uid = NULL; char *rid = NULL; - ECalModelComponent *comp_data; - comp_data = e_cal_model_get_component_at (E_CAL_MODEL (etm), i - 1); - if (!comp_data) - continue; uid = icalcomponent_get_uid (comp_data->icalcomp); if (e_cal_util_component_is_instance (comp_data->icalcomp)) { @@ -656,6 +653,7 @@ model_rows_deleted_cb (ETableModel *etm, int row, int count, gpointer user_data) 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); + g_free (rid); } @@ -1024,8 +1022,8 @@ init_model (EDayView *day_view, ECalModel *model) G_CALLBACK (model_cell_changed_cb), day_view); g_signal_connect (G_OBJECT (model), "model_rows_inserted", G_CALLBACK (model_rows_inserted_cb), day_view); - g_signal_connect (G_OBJECT (model), "model_rows_deleted", - G_CALLBACK (model_rows_deleted_cb), day_view); + g_signal_connect (G_OBJECT (model), "comps_deleted", + G_CALLBACK (model_comps_deleted_cb), day_view); } /* Turn off the background of the canvas windows. This reduces flicker |