[evolution-patches] Limit recurrence dialog usage to events with RECUR-IDs

[JP Rosevear <jpr novell com>]

This prevents the user from seeing the "modify this instance, all
instances, etc" dialog for ordinary recurring events.  Artifact of some
code conversion we did before realizing the recur branch code would not
come in for 2.0.

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2464
diff -u -r1.2464 ChangeLog
--- ChangeLog	28 Jul 2004 18:03:32 -0000	1.2464
+++ ChangeLog	29 Jul 2004 17:56:09 -0000
@@ -1,3 +1,17 @@
+2004-07-29  JP Rosevear  <jpr ximian 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-27  JP Rosevear  <jpr novell com>
 
 	Fixes #62006
Index: gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.250
diff -u -r1.250 e-day-view.c
--- gui/e-day-view.c	16 Jul 2004 14:30:49 -0000	1.250
+++ gui/e-day-view.c	29 Jul 2004 17:56:35 -0000
@@ -3910,7 +3910,7 @@
 		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 @@
 
 	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 @@
 
 	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 @@
 		} 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 @@
 			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 @@
 			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;
Index: gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.220
diff -u -r1.220 e-week-view.c
--- gui/e-week-view.c	27 Jul 2004 02:29:11 -0000	1.220
+++ gui/e-week-view.c	29 Jul 2004 17:56:51 -0000
@@ -3247,7 +3247,7 @@
 	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 @@
 			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;
 				}