[evolution-patches] patch to fix the declining of meetings [calendar]

[chen <pchenthill novell com>]

Hi,
   Have attached the patch. Please review the same.

thanks, chenthill.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.422
diff -u -p -r1.422 ChangeLog
--- ChangeLog	17 Feb 2005 10:15:17 -0000	1.422
+++ ChangeLog	21 Feb 2005 09:46:18 -0000
@@ -1,3 +1,11 @@
+2005-02-21  Chenthill Palanisamy  <pchenthill novell com>
+
+	* backends/groupwise/e-cal-backend-groupwise-utils.c:
+	(e_gw_connection_send_appointment): Return the status as it is.
+	* backends/groupwise/e-cal-backend-groupwise.c
+       	(receive_object): Removed the check for modified item and ok status.
+	Instead checked for the status ALREADY_ACCEPTED directly.
+
 2005-02-17  Chenthill Palanisamy  <pchenthill novell com>
 
 	* backends/groupwise/e-cal-backend-groupwise.c: 
Index: backends/groupwise/e-cal-backend-groupwise-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c,v
retrieving revision 1.51
diff -u -p -r1.51 e-cal-backend-groupwise-utils.c
--- backends/groupwise/e-cal-backend-groupwise-utils.c	10 Feb 2005 08:40:41 -0000	1.51
+++ backends/groupwise/e-cal-backend-groupwise-utils.c	21 Feb 2005 09:46:19 -0000
@@ -1171,7 +1171,7 @@ e_gw_connection_send_appointment (ECalBa
 	}
 	
 	if (status == E_GW_CONNECTION_STATUS_ITEM_ALREADY_ACCEPTED)
-		return E_GW_CONNECTION_STATUS_OK;
+		return status;
 
 	if (!*remove && status == E_GW_CONNECTION_STATUS_OK) {
 		EGwItem *item;
Index: backends/groupwise/e-cal-backend-groupwise.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/e-cal-backend-groupwise.c,v
retrieving revision 1.128
diff -u -p -r1.128 e-cal-backend-groupwise.c
--- backends/groupwise/e-cal-backend-groupwise.c	17 Feb 2005 10:15:18 -0000	1.128
+++ backends/groupwise/e-cal-backend-groupwise.c	21 Feb 2005 09:46:19 -0000
@@ -1743,12 +1743,13 @@ receive_object (ECalBackendGroupwise *cb
 	/* handle attachments */
 	if (e_cal_component_has_attachments (comp))
 		fetch_attachments (cbgw, comp);
+
 	status = e_gw_connection_send_appointment (cbgw, priv->container_id, comp, method, &remove, &modif_comp);
 
 	if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
 		status = e_gw_connection_send_appointment (cbgw, priv->container_id, comp, method, &remove, &modif_comp);
 
-	if (status == E_GW_CONNECTION_STATUS_OK && !modif_comp) {
+	if (status == E_GW_CONNECTION_STATUS_ITEM_ALREADY_ACCEPTED) {
 		g_object_unref (comp);
 		return GNOME_Evolution_Calendar_Success;
 	}
@@ -1759,9 +1760,8 @@ receive_object (ECalBackendGroupwise *cb
 			const char *uid;
 			
 			e_cal_component_get_uid (comp, (const char **) &uid);
-			e_cal_backend_cache_remove_component (priv->cache, uid, NULL);
-			e_cal_backend_notify_object_removed (E_CAL_BACKEND (cbgw), uid, e_cal_component_get_as_string (comp), NULL);
-			g_free (comp);
+			if (e_cal_backend_cache_remove_component (priv->cache, uid, NULL))
+				e_cal_backend_notify_object_removed (E_CAL_BACKEND (cbgw), uid, e_cal_component_get_as_string (comp), NULL);
 		}
 		else {
 			char *cache_comp = NULL, *temp, *new_comp = NULL;

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/ChangeLog,v
retrieving revision 1.22
diff -u -p -r1.22 ChangeLog
--- ChangeLog	17 Feb 2005 08:54:28 -0000	1.22
+++ ChangeLog	21 Feb 2005 09:47:23 -0000
@@ -1,3 +1,8 @@
+2005-02-21  Chenthill Palanisamy  <pchenthill novell com>
+
+	* camel-groupwise-folder.c: (convert_to_calendar): Append
+	the UID to the ICAL string.
+
 2005-02-17  Parthasarathi Susarla <sparthasarathi novell com>
 	
 	* camel-groupwise-store.c: (groupwise_get_folder):
Index: camel-groupwise-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-folder.c,v
retrieving revision 1.26
diff -u -p -r1.26 camel-groupwise-folder.c
--- camel-groupwise-folder.c	17 Feb 2005 08:54:28 -0000	1.26
+++ camel-groupwise-folder.c	21 Feb 2005 09:47:24 -0000
@@ -1135,6 +1135,7 @@ convert_to_calendar (EGwItem *item, char
 	*str = g_strconcat ("BEGIN:VCALENDAR","\n", 
 			    "METHOD:REQUEST", "\n", 
 			    "BEGIN:VEVENT", "\n", 
+			    "UID:", e_gw_item_get_icalid (item), "\n",
 			    "X-GWITEM-TYPE:APPOINTMENT", "\n", 
 			    "DTSTART:", e_gw_item_get_start_date (item), "\n",
 			    "SUMMARY:", e_gw_item_get_subject (item), "\n",