new file -- things shared between the client and server go in this

        * cal-util/Makefile.am: new file -- things shared between
        the client and server go in this directory

        *  calobj.c calobj.h icalendar.c icalendar.h
        timeutil.c timeutil.h cal-util.c cal-util.h where moved
        backend stuff went into pcs.  shared stuff went into
        cal-util.

svn path=/trunk/; revision=2032

3 files changed, 8 insertions, 141 deletions

diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 71e914c5fb..00b66147b7 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -19,6 +19,7 @@ $(CORBA_GENERATED): $(idls)
 INCLUDES =						\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-DG_LOG_DOMAIN=\"cal-client\"			\
+	-I$(top_srcdir)/calendar/cal-util		\
 	-I$(srcdir) -I$(top_srcdir) 			\
 	-I. 						\
 	-I.. 						\
@@ -34,12 +35,11 @@ libcal_client_la_SOURCES =	\
 	$(CORBA_GENERATED)	\
 	cal-client.c		\
 	cal-listener.c		\
-	cal-listener.h		\
-	cal-util.c
+	cal-listener.h
 
 libcal_clientinclude_HEADERS =	\
-	cal-client.h		\
-	cal-util.h
+	cal-client.h
+
 
 #
 # client-test program
@@ -54,7 +54,8 @@ client_test_INCLUDES =			\
 	$(INCLUDES)			\
 	-DG_LOG_DOMAIN=\"client-test\"
 
-client_test_LDADD =				\
-	$(BONOBO_VFS_GNOME_LIBS)		\
-	$(top_builddir)/libversit/libversit.la	\
+client_test_LDADD =					\
+	$(BONOBO_VFS_GNOME_LIBS)			\
+	$(top_builddir)/libversit/libversit.la		\
+	$(top_srcdir)/calendar/cal-util/libcalutil.la	\
 	libcal-client.la
diff --git a/calendar/cal-client/cal-util.c b/calendar/cal-client/cal-util.c
deleted file mode 100644
index f3054af958..0000000000
--- a/calendar/cal-client/cal-util.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include "cal-util.h"
-
-
-
-/**
- * cal_obj_instance_list_free:
- * @list: List of CalObjInstance structures.
- * 
- * Frees a list of CalObjInstance structures.
- **/
-void
-cal_obj_instance_list_free (GList *list)
-{
-	CalObjInstance *i;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		i = l->data;
-
-		g_assert (i != NULL);
-		g_assert (i->uid != NULL);
-		g_assert (i->calobj != NULL);
-
-		g_free (i->uid);
-		g_free (i->calobj);
-		g_free (i);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * cal_obj_uid_list_free:
- * @list: List of strings with unique identifiers.
- *
- * Frees a list of unique identifiers for calendar objects.
- **/
-void
-cal_obj_uid_list_free (GList *list)
-{
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		char *uid;
-
-		uid = l->data;
-		g_free (uid);
-	}
-
-	g_list_free (list);
-}
diff --git a/calendar/cal-client/cal-util.h b/calendar/cal-client/cal-util.h
deleted file mode 100644
index 5087eee4d3..0000000000
--- a/calendar/cal-client/cal-util.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_UTIL_H
-#define CAL_UTIL_H
-
-#include <libgnome/gnome-defs.h>
-#include <time.h>
-#include <glib.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-/* Instance of a calendar object.  This can be an actual occurrence, a
- * recurrence, or an alarm trigger of a `real' calendar object.
- */
-typedef struct {
-	char *uid;			/* Identifier for the object wrapped in calobj */
-	char *calobj;			/* String representation of calendar object */
-	time_t start;			/* Start time of instance */
-	time_t end;			/* End time of instance */
-} CalObjInstance;
-
-void cal_obj_instance_list_free (GList *list);
-
-/* Used for multiple UID queries */
-typedef enum {
-	CALOBJ_TYPE_EVENT   = 1 << 0,
-	CALOBJ_TYPE_TODO    = 1 << 1,
-	CALOBJ_TYPE_JOURNAL = 1 << 2,
-	CALOBJ_TYPE_OTHER   = 1 << 3,
-	CALOBJ_TYPE_ANY     = 0x0f
-} CalObjType;
-
-void cal_obj_uid_list_free (GList *list);
-
-
-
-END_GNOME_DECLS
-
-#endif