From fdedccf06a806442d0f3e34a3a3229429168d6b3 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@src.gnome.org>
Date: Sun, 3 Jun 2007 13:24:44 +0000
Subject:         ** Fixes bug #347767

svn path=/trunk/; revision=33637
---
 calendar/ChangeLog               | 11 +++++++++++
 calendar/calendar.error.xml      |  6 ++++++
 calendar/gui/dialogs/send-comp.c |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ca23866913..f78de9d249 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2006-09-08  Ushveen Kaur <kushveen@novell.com>
+
+	** Fixes bug #347767
+	
+	* gui/dialogs/send-comp.c : (send_component_prompt_subject):
+	error id "calendar:prompt-send-no-subject-memo" or
+	"calendar:prompt-send-no-subject-memo-to-recipients" is called
+	when memo is saved without a summary.
+	* calendar.error.xml : error id "prompt-send-no-subject-memo" is
+	added.
+	
 2007-06-02  Gilles Dartiguelongue  <dartigug@esiee.fr>
 
 	** Fixes bug #439122
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 1d6cc8efc0..1fa63eb29c 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -216,6 +216,12 @@
   <button _label="_Send" 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-no-contents-offline-calendar" type="error" default="GTK_RESPONSE_YES">
   <_primary>Error loading calendar</_primary>
   <_secondary>The calendar is not marked for offline usage.</_secondary>
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index e9f6275400..525f5b92c2 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -92,7 +92,9 @@ send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *c
 			id = "calendar:prompt-send-no-subject-task";
 		break;
 	case E_CAL_COMPONENT_JOURNAL:
-			return TRUE; /* we don't do summaries directly */
+			id = "calendar:prompt-send-no-subject-memo";
+		break;
+
 	default:
 		g_message ("send_component_prompt_subject(): "
 			   "Cannot handle object of type %d", vtype);
-- 
cgit v1.2.3