add proto

2003-11-10  JP Rosevear <jpr@ximian.com>

	* libecal/e-cal.h: add proto

	* libecal/e-cal.c (e_cal_free_change_list): this belongs here

	* libecal/e-cal-types.h: remove proto

	* libecal/Makefile.am: don't build dead file

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b2ce3b9..0dae704 100644 (file)
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-10  JP Rosevear <jpr@ximian.com>
+
+       * libecal/e-cal.h: add proto
+
+       * libecal/e-cal.c (e_cal_free_change_list): this belongs here
+
+       * libecal/e-cal-types.h: remove proto
+
+       * libecal/Makefile.am: don't build dead file
+
 2003-11-07  Dan Winship  <danw@ximian.com>
 
        * libecal/Makefile.am (libecal_la_LDFLAGS): Remove -no-undefined

diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 176a01e..690d9f1 100644 (file)
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -47,7 +47,6 @@ libecal_la_SOURCES =          \
        e-cal-listener.c        \
        e-cal-recur.c           \
        e-cal-time-util.c       \
-       e-cal-types.c           \
        e-cal-util.c            \
        e-cal-view.c            \
        e-cal-view-listener.c

diff --git a/calendar/libecal/e-cal-types.c b/calendar/libecal/e-cal-types.c
deleted file mode 100644 (file)
index d708786..0000000
--- a/calendar/libecal/e-cal-types.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 "e-cal-types.h"
-
-\f
-
-/**
- * cal_client_change_list_free:
- * @list: List of #CalClientChange structures.
- * 
- * Frees a list of #CalClientChange structures.
- **/
-void
-cal_client_change_list_free (GList *list)
-{
-       ECalChange *c;
-       GList *l;
-
-       for (l = list; l; l = l->next) {
-               c = l->data;
-
-               g_assert (c != NULL);
-               g_assert (c->comp != NULL);
-
-               g_object_unref (G_OBJECT (c->comp));
-               g_free (c);
-       }
-
-       g_list_free (list);
-}

diff --git a/calendar/libecal/e-cal-types.h b/calendar/libecal/e-cal-types.h
index 7b3e800..d3e7c79 100644 (file)
--- a/calendar/libecal/e-cal-types.h
+++ b/calendar/libecal/e-cal-types.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef CAL_CLIENT_TYPES_H
-#define CAL_CLIENT_TYPES_H
+#ifndef E_CAL_TYPES_H
+#define E_CAL_TYPES_H
 
 #include <libecal/e-cal-component.h>
 
@@ -67,8 +67,6 @@ typedef enum {
        E_CALENDAR_STATUS_OTHER_ERROR
 } ECalendarStatus;
 
-void cal_client_change_list_free (GList *list);
-
 G_END_DECLS
 
 #endif

diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index ba96c41..8b78f1d 100644 (file)
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -2296,6 +2296,24 @@ e_cal_get_changes (ECal *ecal, const char *change_id, GList **changes, GError **
        E_CALENDAR_CHECK_STATUS (status, error);
 }
 
+void
+e_cal_free_change_list (GList *list)
+{
+       ECalChange *c;
+       GList *l;
+
+       for (l = list; l; l = l->next) {
+               c = l->data;
+
+               g_assert (c != NULL);
+               g_assert (c->comp != NULL);
+
+               g_object_unref (G_OBJECT (c->comp));
+               g_free (c);
+       }
+
+       g_list_free (list);
+}
 
 /**
  * e_cal_get_object_list:

diff --git a/calendar/libecal/e-cal.h b/calendar/libecal/e-cal.h
index 0036e62..35dee49 100644 (file)
--- a/calendar/libecal/e-cal.h
+++ b/calendar/libecal/e-cal.h
@@ -156,6 +156,7 @@ gboolean e_cal_get_object (ECal *ecal,
                                GError **error);
 
 gboolean e_cal_get_changes (ECal *ecal, const char *change_id, GList **changes, GError **error);
+void e_cal_free_change_list (GList *list);
 
 gboolean e_cal_get_object_list (ECal *ecal, const char *query, GList **objects, GError **error);
 gboolean e_cal_get_object_list_as_comp (ECal *ecal, const char *query, GList **objects, GError **error);