[evolution-patches] Patch for bug# 302460



hi,

   I have attached the patch for bug# 302460, which prevents evolution
from crashing when you double click on day/work-week view while it's in
edit mode.

Thanks,
Viren
Index: gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.273
diff -u -p -w -r1.273 e-day-view.c
--- gui/e-day-view.c	16 May 2005 11:43:23 -0000	1.273
+++ gui/e-day-view.c	10 Jun 2005 16:08:21 -0000
@@ -3206,14 +3206,20 @@ e_day_view_on_event_double_click (EDayVi
 		event = &g_array_index (day_view->events[day], EDayViewEvent,
 					event_num);
 
-	e_day_view_stop_editing_event (day_view);
-
-    
-	attendee_prop = icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
-	e_calendar_view_edit_appointment (E_CALENDAR_VIEW (day_view),
+	if (day == day_view->editing_event_day
+        	     && event_num == day_view->editing_event_num
+		     && icalcomponent_get_current_property (event->comp_data->icalcomp)) {
+		attendee_prop = icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY)
+;
+		e_calendar_view_edit_appointment (day_view,
 				     event->comp_data->client, 
 				     event->comp_data->icalcomp, attendee_prop ? TRUE:FALSE);
 }
+	else	
+		e_calendar_view_edit_appointment (day_view,
+					event->comp_data->client,
+					event->comp_data->icalcomp, FALSE);
+}
 
 static void
 popup_destroyed_cb (gpointer data, GObject *where_object_was)
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2744
diff -u -p -w -r1.2744 ChangeLog
--- ChangeLog	8 Jun 2005 15:41:12 -0000	1.2744
+++ ChangeLog	10 Jun 2005 16:08:23 -0000
@@ -1,3 +1,16 @@
+2005-06-10 viren.l <lviren novell com>
+	 Fixes#	302460 
+	 
+	* gui/e-day-view.c (e_day_view_on_event_double_click):
+	 Use icalcomponent_get_current_property to determine whether the
+	 ICAL_ATTENDEE_PROPERTY is set or not, also check day and editing_event_num
+	 exists for the double click event on day view, based on that decide whether it's 
+	 an new calendar entry or editing is performed on existing entry  and
+	 call e_calendar_view_edit_appointment with appropriate 
+	 parameter values.
+	 Doing this Evolution doesn't crash and it prompts user to save changes made to the
+	 summary of current entry.
+
 2005-06-08 viren.l <viren novell com>
 
 	 * gui/dialogs/event-editor.c (event_editor_edit_comp): set COMP_EDITOR_PAGE_USER_ORG


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]