[evolution-patches] patch for bug# 309508 [calendar]

[lviren <lviren novell com>]

Hi,

Attached below is fix for the bug# 309508.
http://bugzilla.gnome.org/show_bug.cgi?id=309508






Thanks,
Viren

Index: gui/dialogs/comp-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.c,v
retrieving revision 1.136
diff -u -p -w -r1.136 comp-editor.c
--- gui/dialogs/comp-editor.c	25 Jun 2005 14:52:30 -0000	1.136
+++ gui/dialogs/comp-editor.c	13 Jul 2005 10:42:36 -0000
@@ -844,8 +844,16 @@ response_cb (GtkWidget *widget, int resp
 					return;
 			}
 			close_dialog (editor);
-		}
 
+			if (delegated) {
+				const char *uid;
+				
+				if (e_error_run (NULL, "calendar:prompt-save-delegated-item", NULL) == GTK_RESPONSE_NO) {
+					e_cal_component_get_uid (priv->comp, &uid);
+					e_cal_remove_object (priv->client, uid, NULL);
+				}					
+			}	
+		}
 		break;
 	case GTK_RESPONSE_HELP:
 		comp_editor_show_help (editor);
Index: calendar.error.xml
===================================================================
RCS file: /cvs/gnome/evolution/calendar/calendar.error.xml,v
retrieving revision 1.3
diff -u -p -w -r1.3 calendar.error.xml
--- calendar.error.xml	6 Jul 2005 07:14:57 -0000	1.3
+++ calendar.error.xml	13 Jul 2005 10:42:36 -0000
@@ -227,4 +227,12 @@
  <_secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version</_secondary>
  </error>
 
+ <error id="prompt-save-delegated-item" type="warning">
+ <title>Delegate</title>
+ <_primary>Meeting delegated</_primary>
+ <_secondary>Keep the original item?</_secondary>
+ <button _label="_Yes" response="GTK_RESPONSE_YES"/>
+ <button _label="_No" response="GTK_RESPONSE_NO"/>
+ </error>
+ 
 </error-list>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2764
diff -u -p -w -r1.2764 ChangeLog
--- ChangeLog	11 Jul 2005 08:59:37 -0000	1.2764
+++ ChangeLog	13 Jul 2005 10:42:39 -0000
@@ -1,3 +1,9 @@
+2005-07-12  viren.l	<lviren novell com>
+	* gui/dialog/comp-edito.c: (response_cb):
+	  Check for delegate flag and remove the object based on the response.
+	* calendar-erros.xml:
+	  Defined a error id prompt-save-delegated-item. 
+
 2005-07-11  Srinivasa Ragavan <sragavan novell com>
 
 	* gui/itip-utils.[ch]: Added a structure.