aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-day-view.c
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2005-03-21 22:29:16 +0800
committerJP Rosevear <jpr@src.gnome.org>2005-03-21 22:29:16 +0800
commit61b62f4127f42ab2b464fcb6e5dcc6a48507c24d (patch)
tree44a55d83bdc1166842aefbe1a9bbf23a665462c5 /calendar/gui/e-day-view.c
parentc090f32fa53222b3d57b4633ffcf551801e4b7b7 (diff)
downloadgsoc2013-evolution-61b62f4127f42ab2b464fcb6e5dcc6a48507c24d.tar.gz
gsoc2013-evolution-61b62f4127f42ab2b464fcb6e5dcc6a48507c24d.tar.zst
gsoc2013-evolution-61b62f4127f42ab2b464fcb6e5dcc6a48507c24d.zip
abort sequence (e_day_view_on_top_canvas_motion): prevent drag of
2005-03-21 JP Rosevear <jpr@novell.com> * gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): abort sequence (e_day_view_on_top_canvas_motion): prevent drag of recurring events (e_day_view_on_main_canvas_motion): ditto * gui/e-calendar-view.c (on_unrecur_appointment): clear recur id svn path=/trunk/; revision=29073
Diffstat (limited to 'calendar/gui/e-day-view.c')
-rw-r--r--calendar/gui/e-day-view.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 860b9e4297..c5af654028 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -3458,8 +3458,7 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
event = &g_array_index (day_view->long_events, EDayViewEvent,
day_view->pressed_event_num);
- if ((e_cal_util_component_is_instance (event->comp_data->icalcomp) ||
- !e_cal_util_component_has_recurrences (event->comp_data->icalcomp))
+ if (!e_cal_util_component_has_recurrences (event->comp_data->icalcomp)
&& (abs (canvas_x - day_view->drag_event_x)
> E_DAY_VIEW_DRAG_START_OFFSET
|| abs (canvas_y - day_view->drag_event_y)
@@ -3487,8 +3486,7 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
cursor = day_view->normal_cursor;
/* Recurring events can't be resized. */
- if (event && (e_cal_util_component_is_instance (event->comp_data->icalcomp) ||
- !e_cal_util_component_has_recurrences (event->comp_data->icalcomp))) {
+ if (event && !e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
switch (pos) {
case E_CALENDAR_VIEW_POS_LEFT_EDGE:
case E_CALENDAR_VIEW_POS_RIGHT_EDGE:
@@ -3564,8 +3562,7 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
event = &g_array_index (day_view->events[day_view->pressed_event_day], EDayViewEvent, day_view->pressed_event_num);
- if ((e_cal_util_component_is_instance (event->comp_data->icalcomp) ||
- !e_cal_util_component_has_recurrences (event->comp_data->icalcomp))
+ if (!e_cal_util_component_has_recurrences (event->comp_data->icalcomp)
&& (abs (canvas_x - day_view->drag_event_x)
> E_DAY_VIEW_DRAG_START_OFFSET
|| abs (canvas_y - day_view->drag_event_y)
@@ -3593,8 +3590,7 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget,
cursor = day_view->normal_cursor;
/* Recurring events can't be resized. */
- if (event && (e_cal_util_component_is_instance (event->comp_data->icalcomp) ||
- !e_cal_util_component_has_recurrences (event->comp_data->icalcomp))) {
+ if (event && !e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
switch (pos) {
case E_CALENDAR_VIEW_POS_LEFT_EDGE:
cursor = day_view->move_cursor;
@@ -7317,6 +7313,7 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget,
*date.value = icaltime_from_timet_with_zone (dt, FALSE,
e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
e_cal_component_set_dtend (comp, &date);
+ e_cal_component_abort_sequence (comp);
gtk_drag_finish (context, TRUE, TRUE, time);