aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog10
-rw-r--r--calendar/Makefile.am9
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c10
-rw-r--r--calendar/conduits/todo/todo-conduit.c8
4 files changed, 25 insertions, 12 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 6aa34c3478..6fd681656b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,15 @@
2000-09-01 JP Rosevear <jpr@helixcode.com>
+ * conduits/todo/todo-conduit.c: Update for new libical.
+ Conduits should atleast compile now.
+
+ * conduits/calendar/calendar-conduit.c: ditto
+
+ * Makefile.am: Build the conduits only when they've been
+ enabled.
+
+2000-09-01 JP Rosevear <jpr@helixcode.com>
+
* gui/event-editor.c: Make toolbar save and close button.
We should put a similar menu option in sometime.
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 00cd1f51b1..e17d581184 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,2 +1,7 @@
-SUBDIRS = idl cal-util pcs cal-client gui
-#SUBDIRS = idl cal-util pcs cal-client gui conduits
+if ENABLE_PILOT_CONDUITS
+CONDUIT_DIR = conduits
+else
+CONDUIT_DIR =
+endif
+
+SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR)
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 8094fee315..7baf099060 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -9,7 +9,6 @@
#include <errno.h>
#include <cal-client/cal-client.h>
-// #include <cal-util/calobj.h>
#include <cal-util/timeutil.h>
#include <pi-source.h>
#include <pi-socket.h>
@@ -407,9 +406,8 @@ ical_from_remote_record(GnomePilotConduitStandardAbs *conduit,
CalComponent *in_obj)
{
CalComponent *obj;
- // int i;
struct Appointment a;
- struct icaltimetype now = icaltimetype_from_timet (time (NULL), FALSE);
+ struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE);
CalComponentText summary = {NULL, NULL};
CalComponentText comment = {NULL, NULL};
@@ -477,7 +475,7 @@ ical_from_remote_record(GnomePilotConduitStandardAbs *conduit,
struct icaltimetype dtstart_ictt;
CalComponentDateTime dtstart;
- dtstart_ictt = icaltimetype_from_timet (mktime (& a.begin), FALSE);
+ dtstart_ictt = icaltime_from_timet (mktime (& a.begin), FALSE, FALSE);
dtstart.value = &dtstart_ictt;
dtstart.tzid = NULL;
cal_component_set_dtstart (obj, &dtstart);
@@ -489,7 +487,7 @@ ical_from_remote_record(GnomePilotConduitStandardAbs *conduit,
struct icaltimetype dtend_ictt;
CalComponentDateTime dtend;
- dtend_ictt = icaltimetype_from_timet (mktime (& a.end), FALSE);
+ dtend_ictt = icaltime_from_timet (mktime (& a.end), FALSE, FALSE);
dtend.value = &dtend_ictt;
dtend.tzid = NULL;
cal_component_set_dtend (obj, &dtend);
@@ -658,7 +656,7 @@ update_record (GnomePilotConduitStandardAbs *conduit,
}
if (status != CAL_CLIENT_GET_SUCCESS) {
- struct icaltimetype now = icaltimetype_from_timet (time (NULL), FALSE);
+ struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE);
printf ("failed, making a new one.\n");
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 2a3c643a3d..3d85dbfa06 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -452,7 +452,7 @@ ical_from_remote_record (GnomePilotConduitStandardAbs *conduit,
{
CalComponent *obj;
struct ToDo todo;
- struct icaltimetype now = icaltimetype_from_timet (time (NULL), FALSE);
+ struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE);
CalComponentText summary = {NULL, NULL};
CalComponentText comment = {NULL, NULL};
@@ -505,7 +505,7 @@ ical_from_remote_record (GnomePilotConduitStandardAbs *conduit,
struct icaltimetype dtend_ictt;
CalComponentDateTime dtend;
- dtend_ictt = icaltimetype_from_timet (mktime (& todo.due), FALSE);
+ dtend_ictt = icaltime_from_timet (mktime (& todo.due), FALSE, FALSE);
dtend.value = &dtend_ictt;
dtend.tzid = NULL;
cal_component_set_dtend (obj, &dtend);
@@ -594,7 +594,7 @@ update_record (GnomePilotConduitStandardAbs *conduit,
}
if (status != CAL_CLIENT_GET_SUCCESS) {
- struct icaltimetype now = icaltimetype_from_timet (time (NULL), FALSE);
+ struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE);
LOG ("failed, making a new one.\n");
@@ -1110,7 +1110,7 @@ transmit (GnomePilotConduitStandardAbs *conduit,
time_t dtend_time_t;
cal_component_get_dtend (local->ical, &dtend);
- dtend_time_t = time_from_icaltimetype (*dtend.value);
+ dtend_time_t = icaltime_as_timet (*dtend.value);
local->todo->due = *localtime (&dtend_time_t);
local->todo->indefinite = (dtend.value->year == 0);