[evolution/gnome-2-32] Bug 653036 - CAL_STATIC_CAPABILITY_SAVE_SCHEDULES misbehaving

[Chenthill Palanisamy <pchen src gnome org>]

commit f782c2c2a25d930983731ac11cda030a3d5fa9f6
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Fri Jul 15 13:00:59 2011 +0530

    Bug 653036 - CAL_STATIC_CAPABILITY_SAVE_SCHEDULES misbehaving

 plugins/itip-formatter/itip-formatter.c |   43 +++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 16 deletions(-)
---
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index d217fbc..0a39e58 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -605,6 +605,29 @@ source_selected_cb (ItipView *view, ESource *source, gpointer data)
 }
 
 static void
+set_rsvp (struct _itip_puri *pitip, ECal *ecal)
+{
+	gboolean rsvp_enabled = FALSE;
+
+	/*
+	 * 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;
+	}
+
+	itip_view_set_show_rsvp (ITIP_VIEW (pitip->view), rsvp_enabled);
+
+	/* default is chosen in extract_itip_data() based on content of the VEVENT */
+	itip_view_set_rsvp (ITIP_VIEW (pitip->view), !pitip->no_reply_wanted);
+}
+
+static void
 find_cal_opened_cb (ECal *ecal, const GError *error, gpointer data)
 {
 	FormatItipFindData *fd = data;
@@ -707,32 +730,20 @@ find_cal_opened_cb (ECal *ecal, const GError *error, gpointer data)
 
 			itip_view_set_mode (ITIP_VIEW (pitip->view), ITIP_VIEW_MODE_PUBLISH);
 		}
+		
+		set_rsvp (pitip, pitip->current_ecal);
 	}
 
  cleanup:
 	d(printf ("Decreasing itip formatter search count to %d\n", fd->count));
 
 	if (fd->count == 0) {
-		gboolean rsvp_enabled = FALSE;
 
 		itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->progress_info_id);
 		pitip->progress_info_id = 0;
 
-		/*
-		 * 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;
-		}
-		itip_view_set_show_rsvp (ITIP_VIEW (pitip->view), rsvp_enabled);
-
-		/* default is chosen in extract_itip_data() based on content of the VEVENT */
-		itip_view_set_rsvp (ITIP_VIEW (pitip->view), !pitip->no_reply_wanted);
+		if (!pitip->current_ecal)
+			set_rsvp (pitip, ecal);
 
 		if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST)
 		    && !pitip->current_ecal) {