[evolution] cal_comp_event_new_with_current_time: Remove 'zone' parameter.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] cal_comp_event_new_with_current_time: Remove 'zone' parameter.
- Date: Wed, 6 Mar 2013 13:47:15 +0000 (UTC)
commit 1419bbb302e7b6cc6d7869ba3e6ababba5175efe
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Mar 6 08:46:11 2013 -0500
cal_comp_event_new_with_current_time: Remove 'zone' parameter.
Get the icaltimezone from the passed in ECalClient.
calendar/gui/comp-util.c | 4 +++-
calendar/gui/comp-util.h | 1 -
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 c0e6dbb..a271100 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 1c91a69..dcf5844 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 d26c2cd..49afb09 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 (
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]