aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c7
-rw-r--r--calendar/conduits/todo/todo-conduit.c9
3 files changed, 12 insertions, 13 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0fae81da76..c105c036cb 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-27 JP Rosevear <jpr@helixcode.com>
+
+ * conduits/todo/todo-conduit.c (free_prepare): Ditto
+
+ * conduits/calendar/calendar-conduit.c (free_prepare): Adjust
+ free_prepare to the correct signal parameters. Don't actually
+ do anything - there is a semantic discrepancy that needs to be
+ resolved.
+
2000-11-26 Damon Chaplin <damon@helixcode.com>
* gui/e-day-view.c (e_day_view_set_days_shown): == instead of =.
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 7341d7a292..6e903b14f1 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1046,18 +1046,13 @@ prepare (GnomePilotConduitSyncAbs *conduit,
static gint
free_prepare (GnomePilotConduitSyncAbs *conduit,
- ECalLocalRecord *local,
- GnomePilotRecord **remote,
+ GnomePilotRecord *remote,
ECalConduitContext *ctxt)
{
LOG ("free_prepare: freeing\n");
- g_return_val_if_fail (local != NULL, -1);
g_return_val_if_fail (remote != NULL, -1);
- g_free (*remote);
- *remote = NULL;
-
return 0;
}
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index b41dead5cc..0884af229d 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -269,7 +269,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
g_assert (local->comp != NULL);
g_assert (local->todo != NULL );
- LOG ("local_record_to_remote_record\n");
+ LOG ("local_record_to_pilot_record\n");
p = g_new0 (GnomePilotRecord, 1);
@@ -920,18 +920,13 @@ prepare (GnomePilotConduitSyncAbs *conduit,
static gint
free_prepare (GnomePilotConduitSyncAbs *conduit,
- EToDoLocalRecord *local,
- GnomePilotRecord **remote,
+ GnomePilotRecord *remote,
EToDoConduitContext *ctxt)
{
LOG ("free_prepare: freeing\n");
- g_return_val_if_fail (local != NULL, -1);
g_return_val_if_fail (remote != NULL, -1);
- g_free (*remote);
- *remote = NULL;
-
return 0;
}