for the long events pass E_DAY_VIEW_LONG_EVENT as the day. Fixes SEGV.

2000-05-04  Damon Chaplin  <damon@helixcode.com>

	* gui/e-day-view.c (e_day_view_foreach_event_with_uid): for the long
	events pass E_DAY_VIEW_LONG_EVENT as the day. Fixes SEGV.

	* gui/calendar-commands.c: when we switch views, grab the focus.

	* gui/gnome-cal.c (gnome_calendar_tag_calendar):
	(gnome_calendar_mark_gtk_calendar_day): changed this so it uses
	cal_client_get_events_in_range(), and doesn't load any objects.
	Also just return if it isn't visible.

	* gui/calendar-commands.c (calendar_get_events_in_range): call
	g_list_sort() to sort the list rather than g_list_insert_sorted() for
	each element. It is much more efficient.
	Also changed it so that the co->ev_start/end fields are copied from
	the CalObjInstance rather than the parameters to the function
	(that is right, isn't it?)
	Also freed the list elements, and finally the list.
	(calendar_iterate): changed this to use cal_client_get_events_in_range
	since that is more efficient than getting all the uids and then loading
	and parsing all the events.

	* pcs/cal-backend.c (save): output the '... saved' message before
	freeing the string!

	* gui/gncal-todo.c (gncal_todo_update):
	* gui/e-week-view.c (e_week_view_update_event):
	* gui/e-day-view.c (e_day_view_update_event):
	* gui/calendar-commands.c (calendar_get_events_in_range):
	(calendar_iterate): free obj_string after it is parsed.

svn path=/trunk/; revision=2802

1 files changed, 4 insertions, 4 deletions

diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 3bacdc68f9..32d06381f4 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -646,6 +646,9 @@ e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
 	if (pos == E_WEEK_VIEW_POS_NONE)
 		return FALSE;
 
+	week_view->pressed_event_num = wveitem->event_num;
+	week_view->pressed_span_num = wveitem->span_num;
+
 	/* Ignore clicks on the event while editing. */
 	if (E_TEXT (span->text_item)->editing)
 		return FALSE;
@@ -653,9 +656,6 @@ e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
 	if (bevent->button.button == 1) {
 		/* Remember the item clicked and the mouse position,
 		   so we can start a drag if the mouse moves. */
-		week_view->pressed_event_num = wveitem->event_num;
-		week_view->pressed_span_num = wveitem->span_num;
-
 		week_view->drag_event_x = bevent->button.x;
 		week_view->drag_event_y = bevent->button.y;
 
@@ -685,7 +685,7 @@ e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
 	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
 	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
 
-#if 0
+#if 1
 	g_print ("In e_week_view_event_item_button_release\n");
 #endif