[evolution-patches] patch for bug #313112 [calendar]

["Viren L" <lviren novell com>]

Hi,

Attached patch fixex bug
http://bugzilla.gnome.org/show_bug.cgi?id=313112



Thanks,
Viren.

Index: gui/e-cal-popup.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-popup.h,v
retrieving revision 1.9
diff -u -p -r1.9 e-cal-popup.h
--- gui/e-cal-popup.h	18 Aug 2005 11:20:23 -0000	1.9
+++ gui/e-cal-popup.h	23 Aug 2005 10:45:19 -0000
@@ -85,6 +85,7 @@ enum _e_cal_popup_target_select_t {
 	E_CAL_POPUP_SELECT_MEETING = 1 <<12,
 	E_CAL_POPUP_SELECT_DELEGATABLE = 1<<13,
 	E_CAL_POPUP_SELECT_ACCEPTABLE = 1<<14,
+	E_CAL_POPUP_SELECT_MOVABLE = 1<<15,
 };
 
 /**
Index: gui/e-cal-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-popup.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-cal-popup.c
--- gui/e-cal-popup.c	18 Aug 2005 11:20:23 -0000	1.15
+++ gui/e-cal-popup.c	23 Aug 2005 10:45:20 -0000
@@ -231,6 +231,9 @@ e_cal_popup_target_new_select(ECalPopup 
 		if (icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY))
 			mask &= ~E_CAL_POPUP_SELECT_HASURL;
 
+		if (!e_cal_get_recurrences_no_master (comp_data->client))
+			mask &= ~E_CAL_POPUP_SELECT_MOVABLE;
+
 		if (e_cal_util_component_has_recurrences (comp_data->icalcomp))
 			mask &= ~E_CAL_POPUP_SELECT_RECURRING;
 		else if (e_cal_util_component_is_instance (comp_data->icalcomp))
Index: gui/e-calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.c,v
retrieving revision 1.90
diff -u -p -r1.90 e-calendar-view.c
--- gui/e-calendar-view.c	5 Aug 2005 12:15:34 -0000	1.90
+++ gui/e-calendar-view.c	23 Aug 2005 10:45:21 -0000
@@ -1547,7 +1547,7 @@ static EPopupItem ecv_child_items [] = {
 	{ E_POPUP_BAR, "50." },
 
 	{ E_POPUP_ITEM, "51.delete", N_("_Delete"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_NONRECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "52.move", N_("Make this Occurrence _Movable"), on_unrecur_appointment, NULL, NULL, E_CAL_POPUP_SELECT_RECURRING | E_CAL_POPUP_SELECT_INSTANCE, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, "52.move", N_("Make this Occurrence _Movable"), on_unrecur_appointment, NULL, NULL, E_CAL_POPUP_SELECT_RECURRING | E_CAL_POPUP_SELECT_INSTANCE, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_MOVABLE },
 	{ E_POPUP_ITEM, "53.delete", N_("Delete this _Occurrence"), on_delete_occurrence, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
 	{ E_POPUP_ITEM, "54.delete", N_("Delete _All Occurrences"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
 };
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2799
diff -u -p -r1.2799 ChangeLog
--- ChangeLog	18 Aug 2005 11:20:22 -0000	1.2799
+++ ChangeLog	23 Aug 2005 10:45:25 -0000
@@ -1,3 +1,13 @@
+2005-08-23  Viren.l  <lviren novell com>
+
+	* gui/e-cal-popup.h: Added a flag E_CAL_POPUP_SELECT_MOVABLE.
+	* gui/e-cal-popup.c: (e_cal_popup_target_new_select)
+	  Mask the above flag if e_cal_get_recurrences_no_master fails.
+	* gui/e-calendar-view.c: Added sensitivity mask for Make this Occurrence _Movable
+	  menu item.
+
+	Fixes #313112.
+	
 2005-08-02  Viren.l  <lviren novell com>
 
 	* gui/dialogs/meeting-page.c:(meeting_page_fill_widgets):