[evolution-data-server] convert to glib data types

[Chenthill Palanisamy <pchen src gnome org>]

commit 18de9d5ee5e1b5d8c20385671d295df9fce4118e
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Tue Sep 7 10:06:32 2010 +0530

    convert to glib data types

 calendar/libedata-cal/e-cal-backend-file-store.c   |    3 +--
 calendar/libedata-cal/e-cal-backend-intervaltree.c |   12 ++++++------
 calendar/libedata-cal/e-cal-backend-intervaltree.h |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/calendar/libedata-cal/e-cal-backend-file-store.c b/calendar/libedata-cal/e-cal-backend-file-store.c
index bdf8c89..4e86f92 100644
--- a/calendar/libedata-cal/e-cal-backend-file-store.c
+++ b/calendar/libedata-cal/e-cal-backend-file-store.c
@@ -690,7 +690,7 @@ e_cal_backend_file_store_load (ECalBackendStore *store)
 		return FALSE;
 
 	/* Parse keys */
-	//priv->keys_cache = e_file_cache_new (priv->key_file_name);
+	priv->keys_cache = e_file_cache_new (priv->key_file_name);
 
 	/* Parse components */
 	icalcomp = e_cal_util_parse_ics_file (priv->cache_file_name);
@@ -906,7 +906,6 @@ cal_backend_file_store_constructed (GObject *object)
 	path = e_cal_backend_store_get_path (E_CAL_BACKEND_STORE (object));
 	priv->cache_file_name = g_build_filename (path, CACHE_FILE_NAME, NULL);
 	priv->key_file_name = g_build_filename (path, KEY_FILE_NAME, NULL);
-	priv->keys_cache = e_file_cache_new (priv->key_file_name);
 }
 
 static void
diff --git a/calendar/libedata-cal/e-cal-backend-intervaltree.c b/calendar/libedata-cal/e-cal-backend-intervaltree.c
index 1796fb0..8323d56 100644
--- a/calendar/libedata-cal/e-cal-backend-intervaltree.c
+++ b/calendar/libedata-cal/e-cal-backend-intervaltree.c
@@ -77,7 +77,7 @@ struct _EIntervalTreePrivate
 	GStaticRecMutex mutex;	
 };
 
-static inline int
+static inline gint
 get_direction (EIntervalNode *x, time_t z_start, time_t z_end)
 {
 	if (x->start == z_start)
@@ -104,7 +104,7 @@ component_key(const gchar *uid, const gchar *rid)
  * the second starts, 1 otherwise.
  *
  **/
-static inline int
+static inline gint
 compare_intervals (time_t x_start, time_t x_end, time_t y_start, time_t y_end)
 {
 	/* assumption: x_start <= x_end */
@@ -594,8 +594,8 @@ e_intervaltree_dump (EIntervalTree *tree)
  **/
 static EIntervalNode*
 e_intervaltree_search_component (EIntervalTree *tree,
-				 const char *searched_uid,
-				 const char *searched_rid)
+				 const gchar *searched_uid,
+				 const gchar *searched_rid)
 {
 	EIntervalTreePrivate *priv = tree->priv;
 	g_return_val_if_fail (tree != NULL, NULL);
@@ -614,8 +614,8 @@ e_intervaltree_search_component (EIntervalTree *tree,
 
 gboolean
 e_intervaltree_remove (EIntervalTree *tree,
-		       const char *uid,
-		       const char *rid)
+		       const gchar *uid,
+		       const gchar *rid)
 {
 	EIntervalTreePrivate *priv = tree->priv;
 	EIntervalNode *y;
diff --git a/calendar/libedata-cal/e-cal-backend-intervaltree.h b/calendar/libedata-cal/e-cal-backend-intervaltree.h
index 299b7a7..a1c529a 100644
--- a/calendar/libedata-cal/e-cal-backend-intervaltree.h
+++ b/calendar/libedata-cal/e-cal-backend-intervaltree.h
@@ -75,7 +75,7 @@ EIntervalTree* e_intervaltree_new(void);
 
 gboolean e_intervaltree_insert (EIntervalTree *tree, time_t start, time_t end, ECalComponent *comp);
 
-gboolean e_intervaltree_remove (EIntervalTree *tree, const char *uid, const char *rid);
+gboolean e_intervaltree_remove (EIntervalTree *tree, const gchar *uid, const gchar *rid);
 
 gpointer e_intervaltree_lookup (EIntervalTree *tree, time_t start, time_t end);