Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.3118
diff -u -p -r1.3118 ChangeLog
--- ChangeLog	1 Sep 2006 08:17:27 -0000	1.3118
+++ ChangeLog	11 Sep 2006 05:38:31 -0000
@@ -1,3 +1,24 @@
+2006-09-11  Ushveen Kaur <kushveen@novell.com>
+
+	** Fixes bug #353794
+	
+	* gui/dialogs/send-comp.c : (send_component_prompt_subject):
+	error id "calendar:prompt-send-no-subject-memo-to-recipients",
+	"calendar:prompt-send-no-subject-task-to-recipients",
+	"calendar:prompt-send-no-subject-calendar-to-recipients" are
+	called when memo,task or appointment are saved without a summary
+	and have an organizer.
+	Whereas, error id "calendar:prompt-send-no-subject-memo",
+	"calendar:prompt-send-no-subject-task",
+	"calendar:prompt-send-no-subject-calendar" are called when
+	memo,task and appointment are saved without a summary and have 
+	no organiser.
+	* calendar.error.xml : 
+	error id "calendar:prompt-send-no-subject-memo-to-recipients",
+	"calendar:prompt-send-no-subject-task-to-recipients",
+	"calendar:prompt-send-no-subject-calendar-to-recipients" are
+	added.
+
 2006-09-01  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #353763
Index: calendar.error.xml
===================================================================
RCS file: /cvs/gnome/evolution/calendar/calendar.error.xml,v
retrieving revision 1.20
diff -u -p -r1.20 calendar.error.xml
--- calendar.error.xml	22 Jul 2006 10:15:58 -0000	1.20
+++ calendar.error.xml	11 Sep 2006 05:38:31 -0000
@@ -202,16 +202,41 @@
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
  
- <error id="prompt-send-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
+ <error id="prompt-send-no-subject-calendar" type="question" default="GTK_RESPONSE_CANCEL">
+  <_primary>Are you sure you want to save the appointment without a summary?</_primary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Save" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_CANCEL">
+  <_primary>Are you sure you want to save the task without a summary?</_primary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Save" response="GTK_RESPONSE_YES"/>
+ </error>
+
+<error id="prompt-send-no-subject-memo" type="question" default="GTK_RESPONSE_CANCEL">
+  <_primary>Are you sure you want to save the memo without a summary?</_primary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Save" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-send-no-subject-calendar-to-recipients" type="question" default="GTK_RESPONSE_CANCEL">
   <_primary>Are you sure you want to send the appointment without a summary?</_primary>
   <_secondary>Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about.</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Save" response="GTK_RESPONSE_YES"/>
+  <button _label="_Send" response="GTK_RESPONSE_YES"/>
  </error>
 
- <error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_YES">
+ <error id="prompt-send-no-subject-task-to-recipients" type="question" default="GTK_RESPONSE_CANCEL">
   <_primary>Are you sure you want to send the task without a summary?</_primary>
   <_secondary>Adding a meaningful summary to your task will give your recipients an idea of what your task is about.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Send" response="GTK_RESPONSE_YES"/>
+ </error>
+
+<error id="prompt-send-no-subject-memo-to-recipients" type="question" default="GTK_RESPONSE_CANCEL">
+  <_primary>Are you sure you want to send the memo without a summary?</_primary>
+  <_secondary>Adding a meaningful summary to your memo will give your recipients an idea of what your memo is about.</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   <button _label="_Send" response="GTK_RESPONSE_YES"/>
  </error>
Index: gui/dialogs/send-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/send-comp.c,v
retrieving revision 1.19
diff -u -p -r1.19 send-comp.c
--- gui/dialogs/send-comp.c	10 Aug 2006 07:34:30 -0000	1.19
+++ gui/dialogs/send-comp.c	11 Sep 2006 05:38:31 -0000
@@ -83,24 +83,50 @@ send_component_prompt_subject (GtkWindow
 	
 	vtype = e_cal_component_get_vtype (comp);
 
-	switch (vtype) {
-	case E_CAL_COMPONENT_EVENT:
-			id = "calendar:prompt-send-no-subject-calendar";
-		break;
+	if (e_cal_component_has_organizer (comp)) { 
+	    switch (vtype) {
+		case E_CAL_COMPONENT_EVENT:
+		    id = "calendar:prompt-send-no-subject-calendar-to-recipients";
+		    break;
+		    
+		case E_CAL_COMPONENT_TODO:
+		    id = "calendar:prompt-send-no-subject-task-to-recipients";
+		    break;
 
-	case E_CAL_COMPONENT_TODO:
-			id = "calendar:prompt-send-no-subject-task";
-		break;
-	case E_CAL_COMPONENT_JOURNAL:
-			return TRUE; /* we don't do summaries directly */
-	default:
-		g_message ("send_component_prompt_subject(): "
-			   "Cannot handle object of type %d", vtype);
-		return FALSE;
+		case E_CAL_COMPONENT_JOURNAL:
+		    id = "calendar:prompt-send-no-subject-memo-to-recipients";
+		    break;
+		    
+		default:
+		    g_message ("send_component_prompt_subject(): "
+			       "Cannot handle object of type %d", vtype);
+		    return FALSE;
+	    }
+	}
+	else {
+	    switch (vtype) {
+		case E_CAL_COMPONENT_EVENT:
+		    id = "calendar:prompt-send-no-subject-calendar";
+		    break;
+		    
+		case E_CAL_COMPONENT_TODO:
+		    id = "calendar:prompt-send-no-subject-task";
+		    break;
+
+		case E_CAL_COMPONENT_JOURNAL:
+		    id = "calendar:prompt-send-no-subject-memo";
+		    break;
+		    
+		default:
+		    g_message ("send_component_prompt_subject(): "
+			       "Cannot handle object of type %d", vtype);
+		    return FALSE;
+	    }
+	    
 	}
-	
 	if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES)
-		return TRUE;
+	    return TRUE;
 	else
-		return FALSE;
+	    return FALSE;
 }
+	
