evolution r36747 - branches/gnome-2-24/plugins/itip-formatter trunk/plugins/itip-formatter

[pohly svn gnome org]

Author: pohly
Date: Thu Nov  6 20:23:15 2008
New Revision: 36747
URL: http://svn.gnome.org/viewvc/evolution?rev=36747&view=rev

Log:
#541121: itip-formatter: don't allow sending a response to meeting
invitation replies


Modified:
   branches/gnome-2-24/plugins/itip-formatter/ChangeLog
   branches/gnome-2-24/plugins/itip-formatter/itip-formatter.c
   trunk/plugins/itip-formatter/ChangeLog
   trunk/plugins/itip-formatter/itip-formatter.c

Modified: branches/gnome-2-24/plugins/itip-formatter/itip-formatter.c
==============================================================================
--- branches/gnome-2-24/plugins/itip-formatter/itip-formatter.c	(original)
+++ branches/gnome-2-24/plugins/itip-formatter/itip-formatter.c	Thu Nov  6 20:23:15 2008
@@ -686,9 +686,12 @@
 		
 		/*
 		 * Only allow replies if backend doesn't do that automatically.
+                 * Only enable it for forwarded invitiations (PUBLISH) or direct
+                 * invitiations (REQUEST), but not replies (REPLY).
 		 * Replies only make sense for events with an organizer.
 		 */
 		if (!e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_SAVE_SCHEDULES) &&
+                    (pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) &&
 		    pitip->has_organizer) {
 			rsvp_enabled = TRUE;
 		}

Modified: trunk/plugins/itip-formatter/itip-formatter.c
==============================================================================
--- trunk/plugins/itip-formatter/itip-formatter.c	(original)
+++ trunk/plugins/itip-formatter/itip-formatter.c	Thu Nov  6 20:23:15 2008
@@ -686,9 +686,12 @@
 		
 		/*
 		 * Only allow replies if backend doesn't do that automatically.
+                 * Only enable it for forwarded invitiations (PUBLISH) or direct
+                 * invitiations (REQUEST), but not replies (REPLY).
 		 * Replies only make sense for events with an organizer.
 		 */
 		if (!e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_SAVE_SCHEDULES) &&
+                    (pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) &&
 		    pitip->has_organizer) {
 			rsvp_enabled = TRUE;
 		}