diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 3 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f278c69508..722978bdfa 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2006-04-24 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #332409 + * gui/calendar-component.c: (setup_create_ecal): Reset the ecal to NULL. + * gui/e-calendar-view.c: + (e_calendar_view_new_appointment_for): If the default client does not + exist do not open the dialog. + 2006-04-22 Harish Krishnaswamy <kharish@novell.com> * gui/dialogs/event-page.c (attendee_added_cb): diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index b88850c8ce..5b01f5563e 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -1138,8 +1138,11 @@ setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Unable to open the calendar '%s' for creating events and meetings"), e_source_peek_name (source)); + gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); + g_object_unref (priv->create_ecal); + priv->create_ecal = NULL; return NULL; } diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index d612dc1432..3b9c0758de 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -1843,7 +1843,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view, default_client = e_cal_model_get_default_client (priv->model); - if (default_client && e_cal_get_load_state (default_client) != E_CAL_LOAD_LOADED) { + if (!default_client || e_cal_get_load_state (default_client) != E_CAL_LOAD_LOADED) { g_warning ("Default client not loaded \n"); return; } @@ -1906,7 +1906,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view, flags |= COMP_EDITOR_USER_ORG; } - open_event_with_flags (cal_view, e_cal_model_get_default_client (priv->model), + open_event_with_flags (cal_view, default_client, icalcomp, flags); g_object_unref (comp); |