From e1fec87c2d1e2faa5667105d1d6d174a006dd72b Mon Sep 17 00:00:00 2001
From: Sivaiah Nallagatla <siva@src.gnome.org>
Date: Thu, 23 Dec 2004 18:12:52 +0000
Subject: Merging offline brnach with HEAD

svn path=/trunk/; revision=28195
---
 calendar/ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'calendar/ChangeLog')

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0fca80d588..29f3147141 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-23  Chenthill Palanisamy <pchenthill@novell.com>
+
+	Part of merge from offline branch 
+	
+	* gui/dialogs/calendar-setup.c
+	(eccp_general_offline): function to add the check box for
+	folder offline settings.
+	(offline_status_changed_cb): call back function for the same.
+	(ECalConfigItem eccp_items[]), (ECalConfigItem ectp_items[]):
+	 Added the check box function call in both the structures.
+	
 2004-12-23  Rodrigo Moya <rodrigo@novell.com>
 
 	* gui/e-cal-model.c (set_instance_times): get instance times using
-- 
cgit v1.2.3