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-week-view.c | |
parent | 4c8aa5982c0132716f473873d0e1d7601df14607 (diff) | |
download | gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.gz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.bz2 gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.lz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.xz 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-week-view.c')
-rw-r--r-- | calendar/gui/e-week-view.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index aa459f817d..67dc931c68 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -401,25 +401,21 @@ 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) { EWeekView *week_view = E_WEEK_VIEW (user_data); - int i; + GSList *l, *list = data; /* FIXME Stop editing? */ if (!E_CALENDAR_VIEW (week_view)->in_focus) { return; } - for (i = row + count; i > row; i--) { + for (l = list; l != NULL; l = g_slist_next (l)) { gint event_num; const char *uid; char *rid = NULL; - ECalModelComponent *comp_data; - - comp_data = e_cal_model_get_component_at (E_CAL_MODEL (etm), i - 1); - if (!comp_data) - continue; + ECalModelComponent *comp_data = l->data; uid = icalcomponent_get_uid (comp_data->icalcomp); if (e_cal_util_component_is_instance (comp_data->icalcomp)) { @@ -626,8 +622,8 @@ init_model (EWeekView *week_view, ECalModel *model) G_CALLBACK (model_cell_changed_cb), week_view); g_signal_connect (G_OBJECT (model), "model_rows_inserted", G_CALLBACK (model_rows_inserted_cb), week_view); - g_signal_connect (G_OBJECT (model), "model_rows_deleted", - G_CALLBACK (model_rows_deleted_cb), week_view); + g_signal_connect (G_OBJECT (model), "comps_deleted", + G_CALLBACK (model_comps_deleted_cb), week_view); } |