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.h | |
parent | f9049cded460a9e316fa83ff1941970abfe0fd09 (diff) | |
parent | 10fef4ac0f4ef7dc907e8bfae9844d4e8be3d80d (diff) | |
download | gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.gz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.bz2 gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.lz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.xz 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.h')
-rw-r--r-- | calendar/gui/e-cal-model.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 6f3d3637b1..adaf736494 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -163,7 +163,7 @@ void e_cal_model_set_time_range (ECalModel const gchar *e_cal_model_get_search_query (ECalModel *model); void e_cal_model_set_search_query (ECalModel *model, const gchar *sexp); -icalcomponent *e_cal_model_create_component_with_defaults (ECalModel *model); +icalcomponent *e_cal_model_create_component_with_defaults (ECalModel *model, gboolean all_day); const gchar *e_cal_model_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data); gboolean e_cal_model_get_rgb_color_for_component (ECalModel *model, |