diff options
| -rw-r--r-- | calendar/ChangeLog | 14 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 12 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 4 |
3 files changed, 22 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 0a21c0d609..21daa1acfe 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,17 @@ +2004-07-31 JP Rosevear <jpr@novell.com> + + * gui/e-day-view.c (e_day_view_finish_long_event_resize): guard + with is_instance instead of has_recurrences because most of the + backends don't support this yet + (e_day_view_finish_resize): ditto + (e_day_view_change_event_time): ditto + (e_day_view_on_editing_stopped): ditto + (e_day_view_on_top_canvas_drag_data_received): ditto + (e_day_view_on_main_canvas_drag_data_received): ditto + + * gui/e-week-view.c (e_week_view_change_event_time): ditto + (e_week_view_on_editing_stopped): ditto + 2004-07-30 Harish Krishnaswamy <kharish@novell.com> * gui/e-tasks.c: (client_cal_opened_cb), diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 43715338d0..cf60e91fcc 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -3910,7 +3910,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view) e_cal_component_set_dtend (comp, &date); } - if (e_cal_component_has_recurrences (comp)) { + if (e_cal_component_is_instance (comp)) { if (!recur_component_dialog (client, comp, &mod, NULL)) { gtk_widget_queue_draw (day_view->top_canvas); goto out; @@ -3990,7 +3990,7 @@ e_day_view_finish_resize (EDayView *day_view) day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE; - if (e_cal_component_has_recurrences (comp)) { + if (e_cal_component_is_instance (comp)) { if (!recur_component_dialog (client, comp, &mod, NULL)) { gtk_widget_queue_draw (day_view->top_canvas); goto out; @@ -5842,7 +5842,7 @@ e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE; - if (e_cal_component_has_recurrences (comp)) { + if (e_cal_component_is_instance (comp)) { if (!recur_component_dialog (client, comp, &mod, NULL)) { gtk_widget_queue_draw (day_view->top_canvas); goto out; @@ -6055,7 +6055,7 @@ e_day_view_on_editing_stopped (EDayView *day_view, } else { CalObjModType mod = CALOBJ_MOD_ALL; GtkWindow *toplevel; - if (e_cal_component_has_recurrences (comp)) { + if (e_cal_component_is_instance (comp)) { if (!recur_component_dialog (client, comp, &mod, NULL)) { goto out; } @@ -7160,7 +7160,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget, if (event->canvas_item) gnome_canvas_item_show (event->canvas_item); - if (e_cal_component_has_recurrences (comp)) { + if (e_cal_component_is_instance (comp)) { if (!recur_component_dialog (client, comp, &mod, NULL)) return; } @@ -7348,7 +7348,7 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget, if (event->canvas_item) gnome_canvas_item_show (event->canvas_item); - if (e_cal_component_has_recurrences (comp)) { + if (e_cal_component_is_instance (comp)) { if (!recur_component_dialog (client, comp, &mod, NULL)) { g_object_unref (comp); return; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 66b0f24133..d53918ae5e 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -3247,7 +3247,7 @@ e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end week_view->last_edited_comp_string = e_cal_component_get_as_string (comp); - if (e_cal_component_has_recurrences (comp)) { + if (e_cal_component_is_instance (comp)) { if (!recur_component_dialog (client, comp, &mod, NULL)) { gtk_widget_queue_draw (week_view->main_canvas); goto out; @@ -3372,7 +3372,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, CalObjModType mod = CALOBJ_MOD_ALL; GtkWindow *toplevel; - if (e_cal_component_has_recurrences (comp)) { + if (e_cal_component_is_instance (comp)) { if (!recur_component_dialog (client, comp, &mod, NULL)) { goto out; } |