Remove a bunch of old #if 0 code. (update_item): Set

	* gui/e-itip-control.c: Remove a bunch of old #if 0 code.
	(update_item): Set X-MICROSOFT-CDO-REPLYTIME here.

	* gui/itip-utils.c (comp_toplevel_with_zones): Don't set it here.

	* cal-util/cal-component.c (ensure_mandatory_properties): Use
	icaltime_current_time_with_zone rather than rolling our own.
	(cal_component_strip_errors): Remove unused variable.

svn path=/trunk/; revision=17770

1 files changed, 0 insertions, 28 deletions

diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 7f27749731..8e0879833f 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -311,34 +311,6 @@ comp_toplevel_with_zones (CalComponentItipMethod method, CalComponent *comp, Cal
 
 	icomp = cal_component_get_icalcomponent (comp);
 
-	if (method == CAL_COMPONENT_METHOD_REPLY) {
-		struct icaltimetype dtstamp;
-		gboolean add_it = FALSE;
-
-		/* workaround for Outlook expecting a X-MICROSOFT-CDO-REPLYTIME
-		   on every METHOD=REPLY message. If the component has any of
-		   the X-MICROSOFT-* properties, we add the REPLYTIME one */
-		prop = icalcomponent_get_first_property (icomp, ICAL_X_PROPERTY);
-		while (prop) {
-			const char *x_name;
-
-			x_name = icalproperty_get_x_name (prop);
-			if (!strncmp (x_name, "X-MICROSOFT-", strlen ("X-MICROSOFT-"))) {
-				add_it = TRUE;
-				break;
-			}
-			prop = icalcomponent_get_next_property (icomp, ICAL_X_PROPERTY);
-		}
-
-		if (add_it) {
-			dtstamp = icaltime_from_timet_with_zone (
-				time (NULL), 0, icaltimezone_get_utc_timezone ());
-			prop = icalproperty_new_x (icaltime_as_ical_string (dtstamp));
-			icalproperty_set_x_name (prop, "X-MICROSOFT-CDO-REPLYTIME");
-			icalcomponent_add_property (icomp, prop);
-		}
-	}	
- 
 	tz_data.tzids = g_hash_table_new (g_str_hash, g_str_equal);
 	tz_data.icomp = top_level;
 	tz_data.client = client;