diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-11 02:11:48 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-11 02:11:48 +0800 |
| commit | 31fd01398cc76d3c00abbc05d419dfe873bc04c6 (patch) | |
| tree | 35c238cdb2a8a68936fa659e5269e75ee0042b49 /calendar/gui/e-cal-model.c | |
| parent | f9049cded460a9e316fa83ff1941970abfe0fd09 (diff) | |
| parent | 10fef4ac0f4ef7dc907e8bfae9844d4e8be3d80d (diff) | |
| download | gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.gz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.zst gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/util/addressbook.h
calendar/gui/e-week-view-main-item.c
configure.ac
e-util/Makefile.am
mail/em-account-editor.c
mail/em-folder-selection-button.c
shell/e-shell.c
Diffstat (limited to 'calendar/gui/e-cal-model.c')
| -rw-r--r-- | calendar/gui/e-cal-model.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 4af9b88994..672375c5f8 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -856,7 +856,7 @@ ecm_append_row (ETableModel *etm, ETableModel *source, gint row) if (!(comp_data.client && e_cal_get_load_state (comp_data.client) == E_CAL_LOAD_LOADED)) return; - comp_data.icalcomp = e_cal_model_create_component_with_defaults (model); + comp_data.icalcomp = e_cal_model_create_component_with_defaults (model, FALSE); /* set values for our fields */ set_categories (&comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_CATEGORIES, row)); @@ -2139,7 +2139,7 @@ e_cal_model_set_search_query_with_time_range (ECalModel *model, const gchar *sex * e_cal_model_create_component_with_defaults */ icalcomponent * -e_cal_model_create_component_with_defaults (ECalModel *model) +e_cal_model_create_component_with_defaults (ECalModel *model, gboolean all_day) { ECalModelPrivate *priv; ECalComponent *comp; @@ -2158,7 +2158,7 @@ e_cal_model_create_component_with_defaults (ECalModel *model) switch (priv->kind) { case ICAL_VEVENT_COMPONENT : - comp = cal_comp_event_new_with_defaults (client); + comp = cal_comp_event_new_with_defaults (client, all_day); break; case ICAL_VTODO_COMPONENT : comp = cal_comp_task_new_with_defaults (client); |