[evolution-patches] patches to fix #73458 (camel-groupwise and groupwise-send-options plugin)

["Jain Vivek" <jvivek novell com>]

Hi,

The attached patches fix
http://bugzilla.ximian.com/show_bug.cgi?id=73458

changes are made in camel-groupwise-utils.[ch]
and plugins/groupwise-send-options/send-options.[ch]

Thanks,
Vivek

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-send-options/ChangeLog,v
retrieving revision 1.3
diff -u -p -r1.3 ChangeLog
--- ChangeLog	9 Mar 2005 11:45:50 -0000	1.3
+++ ChangeLog	14 Mar 2005 14:17:44 -0000
@@ -1,3 +1,9 @@
+2005-03-14 Vivek Jain <jvivek novell com>
+		
+	* send-options.h: 
+        * send-options.c: (org_gnome_compose_send_options): replace
+	X_RETURN_NOTIFY_DECLINE with X_RETURN_NOTIFY_DELETE
+
 2005-03-09  Sankar P <psankar novell com>
 
 	* send-options.c: (org_gnome_compose_send_options)
Index: send-options.h
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-send-options/send-options.h,v
retrieving revision 1.1
diff -u -p -r1.1 send-options.h
--- send-options.h	10 Jan 2005 15:23:03 -0000	1.1
+++ send-options.h	14 Mar 2005 14:17:44 -0000
@@ -35,6 +35,6 @@
 #define	X_TRACK_WHEN		"X-track-when"
 #define	X_AUTODELETE		"X-auto-delete"
 #define	X_RETURN_NOTIFY_OPEN	"X-return-notify-open"
-#define	X_RETURN_NOTIFY_DECLINE	"X-return-notify-decline"
+#define	X_RETURN_NOTIFY_DELETE	"X-return-notify-delete"
 
 #endif /*__GW_SEND_OPTIONS__*/
Index: send-options.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-send-options/send-options.c,v
retrieving revision 1.3
diff -u -p -r1.3 send-options.c
--- send-options.c	9 Mar 2005 11:45:50 -0000	1.3
+++ send-options.c	14 Mar 2005 14:17:44 -0000
@@ -133,7 +133,7 @@ org_gnome_compose_send_options (EPlugin 
 	}
 	if (dialog->data->sopts->declined) {
 		temp = g_strdup_printf ("%d",dialog->data->sopts->declined) ;
-		e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DECLINE, temp) ;
+		e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp) ;
 		g_free (temp) ;
 	}
 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/ChangeLog,v
retrieving revision 1.36
diff -u -p -r1.36 ChangeLog
--- ChangeLog	10 Mar 2005 06:59:15 -0000	1.36
+++ ChangeLog	14 Mar 2005 14:22:49 -0000
@@ -1,3 +1,12 @@
+2005-03-14  Vivek Jain <jvivek novell com>
+	
+	**Fixes bug #73458
+	* camel-groupwise-utils.h: changed the  X_RETURN_NOTIFY_DECLINE to 
+	 X_RETURN_NOTIFY_DELETE 
+	* camel-groupwise-utils.c: check the property and then call
+	 (e_gw_item_set_notify_deleted) instead of
+	 (e_gw_item_set_notify_declined )
+
 2005-03-10  Parthasarathi Susarla <sparthasarathi novell com>
 	
 	* camel-groupwise-store.c:
Index: camel-groupwise-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-utils.c,v
retrieving revision 1.11
diff -u -p -r1.11 camel-groupwise-utils.c
--- camel-groupwise-utils.c	9 Mar 2005 11:49:49 -0000	1.11
+++ camel-groupwise-utils.c	14 Mar 2005 14:22:49 -0000
@@ -473,12 +473,12 @@ camel_groupwise_util_item_from_message (
 			case 1: e_gw_item_set_notify_opened (item, E_GW_ITEM_NOTIFY_MAIL);
 		}
 	}
-	send_options = (char *)camel_medium_get_header (CAMEL_MEDIUM (message), X_RETURN_NOTIFY_DECLINE) ;
+	send_options = (char *)camel_medium_get_header (CAMEL_MEDIUM (message), X_RETURN_NOTIFY_DELETE) ;
 	if (send_options) {
 		switch (atoi(send_options)) {
-			case 0: e_gw_item_set_notify_declined (item, E_GW_ITEM_NOTIFY_NONE);
+			case 0: e_gw_item_set_notify_deleted (item, E_GW_ITEM_NOTIFY_NONE);
 				break;
-			case 1: e_gw_item_set_notify_declined (item, E_GW_ITEM_NOTIFY_MAIL);
+			case 1: e_gw_item_set_notify_deleted (item, E_GW_ITEM_NOTIFY_MAIL);
 		}
 	}	
 	
Index: camel-groupwise-utils.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-utils.h,v
retrieving revision 1.4
diff -u -p -r1.4 camel-groupwise-utils.h
--- camel-groupwise-utils.h	28 Feb 2005 11:27:52 -0000	1.4
+++ camel-groupwise-utils.h	14 Mar 2005 14:22:49 -0000
@@ -39,7 +39,7 @@
 #define X_TRACK_WHEN            "X-track-when"
 #define X_AUTODELETE            "X-auto-delete"
 #define X_RETURN_NOTIFY_OPEN    "X-return-notify-open"
-#define X_RETURN_NOTIFY_DECLINE "X-return-notify-decline"
+#define X_RETURN_NOTIFY_DELETE  "X-return-notify-delete"
 
 /* Folder types for source */
 #define RECEIVED  "Mailbox"