diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-06 21:46:11 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-06 21:47:03 +0800 |
| commit | 1419bbb302e7b6cc6d7869ba3e6ababba5175efe (patch) | |
| tree | 3d65a1937a502f8fdb1d0e53e79a7b9b17f46d6e | |
| parent | 06eeeb23d73b7ac65ff87b74fecc3c331dc44b65 (diff) | |
| download | gsoc2013-evolution-1419bbb302e7b6cc6d7869ba3e6ababba5175efe.tar gsoc2013-evolution-1419bbb302e7b6cc6d7869ba3e6ababba5175efe.tar.gz gsoc2013-evolution-1419bbb302e7b6cc6d7869ba3e6ababba5175efe.tar.bz2 gsoc2013-evolution-1419bbb302e7b6cc6d7869ba3e6ababba5175efe.tar.lz gsoc2013-evolution-1419bbb302e7b6cc6d7869ba3e6ababba5175efe.tar.xz gsoc2013-evolution-1419bbb302e7b6cc6d7869ba3e6ababba5175efe.tar.zst gsoc2013-evolution-1419bbb302e7b6cc6d7869ba3e6ababba5175efe.zip | |
cal_comp_event_new_with_current_time: Remove 'zone' parameter.
Get the icaltimezone from the passed in ECalClient.
| -rw-r--r-- | calendar/gui/comp-util.c | 4 | ||||
| -rw-r--r-- | calendar/gui/comp-util.h | 1 | ||||
| -rw-r--r-- | modules/calendar/e-cal-shell-backend.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index c0e6dbb74c..a271100167 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -364,7 +364,6 @@ cal_comp_event_new_with_defaults (ECalClient *client, ECalComponent * cal_comp_event_new_with_current_time (ECalClient *client, gboolean all_day, - icaltimezone *zone, gboolean use_default_reminder, gint default_reminder_interval, EDurationType default_reminder_units) @@ -372,12 +371,15 @@ cal_comp_event_new_with_current_time (ECalClient *client, ECalComponent *comp; struct icaltimetype itt; ECalComponentDateTime dt; + icaltimezone *zone; comp = cal_comp_event_new_with_defaults ( client, all_day, use_default_reminder, default_reminder_interval, default_reminder_units); g_return_val_if_fail (comp != NULL, NULL); + zone = e_cal_client_get_default_timezone (client); + if (all_day) { itt = icaltime_from_timet_with_zone (time (NULL), 1, zone); diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h index 1c91a69d64..dcf5844c79 100644 --- a/calendar/gui/comp-util.h +++ b/calendar/gui/comp-util.h @@ -57,7 +57,6 @@ ECalComponent * cal_comp_event_new_with_defaults ECalComponent * cal_comp_event_new_with_current_time (ECalClient *client, gboolean all_day, - icaltimezone *zone, gboolean use_default_reminder, gint default_reminder_interval, EDurationType default_reminder_units); diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index d26c2cdea9..49afb09d24 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -75,8 +75,6 @@ cal_shell_backend_new_event (ECalClient *cal_client, editor = event_editor_new (cal_client, shell, flags); comp = cal_comp_event_new_with_current_time ( cal_client, all_day, - e_shell_settings_get_pointer ( - shell_settings, "cal-timezone"), e_shell_settings_get_boolean ( shell_settings, "cal-use-default-reminder"), e_shell_settings_get_int ( |