diff options
| -rw-r--r-- | calendar/ChangeLog | 16 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 6 | ||||
| -rw-r--r-- | calendar/gui/dialogs/event-page.c | 5 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 4 | ||||
| -rw-r--r-- | calendar/gui/tasks-component.c | 5 |
5 files changed, 36 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index cfb6f59dd2..06aff579ad 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,19 @@ +2004-08-06 JP Rosevear <jpr@ximian.com> + + Fixes #62021 + + * gui/dialogs/event-page.c (source_changed_cb): set the default + timezone + + * gui/e-itip-control.c (start_calendar_server): set the default + timezone + + * gui/calendar-component.c (setup_create_ecal): set the default + timezone, as the component view is not alive and hence has not set + it + + * gui/tasks-component.c (setup_create_ecal): ditto + 2004-08-05 Parthasarathi S A <sparthasarathi@novell.com> Fix for bug #61673. diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 24b8b61c40..e7c9b01ccd 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -921,6 +921,8 @@ setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView } if (priv->create_ecal) { + icaltimezone *zone; + if (!e_cal_open (priv->create_ecal, FALSE, NULL)) { GtkWidget *dialog; @@ -933,6 +935,10 @@ setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView return NULL; } + + zone = calendar_config_get_icaltimezone (); + e_cal_set_default_timezone (priv->create_ecal, zone, NULL); + } else { GtkWidget *dialog; diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index af7768e69f..0b6fa70727 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -1607,6 +1607,11 @@ source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } else { + icaltimezone *zone; + + zone = calendar_config_get_icaltimezone (); + e_cal_set_default_timezone (client, zone, NULL); + comp_editor_notify_client_changed ( COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), client); diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 881deb8773..9454961661 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -131,6 +131,7 @@ start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type) { EItipControlPrivate *priv; ECal *ecal; + icaltimezone *zone; priv = itip->priv; @@ -142,6 +143,9 @@ start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type) if (!e_cal_open (ecal, TRUE, NULL)) return NULL; + zone = calendar_config_get_icaltimezone (); + e_cal_set_default_timezone (ecal, zone, NULL); + g_hash_table_insert (priv->ecals[type], g_strdup (e_source_peek_uid (source)), ecal); return ecal; diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index b3eb57995f..76843b264e 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -748,6 +748,8 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view } if (priv->create_ecal) { + icaltimezone *zone; + if (!e_cal_open (priv->create_ecal, FALSE, NULL)) { GtkWidget *dialog; @@ -760,6 +762,9 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view return NULL; } + + zone = calendar_config_get_icaltimezone (); + e_cal_set_default_timezone (priv->create_ecal, zone, NULL); } else { GtkWidget *dialog; |