aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/Makefile.am9
-rw-r--r--calendar/gui/Makefile.am9
-rw-r--r--calendar/timeutil.c29
3 files changed, 43 insertions, 4 deletions
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index f4c7ead95d..529b9cca23 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -3,7 +3,9 @@ INCLUDES = \
$(GNOME_INCLUDEDIR) \
-I../../gcalendar
-bin_PROGRAMS = gncal
+bin_PROGRAMS = gncal objedit
+
+objedit_SOURCES = objedit.c
gncal_SOURCES = \
gncal.c \
@@ -13,13 +15,16 @@ gncal_SOURCES = \
clist.c \
clist.h
-gncal_LDADD = \
+LINK_FLAGS = \
$(GNOME_LIBDIR) \
$(GNOMEUI_LIBS) \
$(INTLLIBS) \
../../gcalendar/gtkcalendar.o \
../../gcalendar/lib_date.o
+gncal_LDADD = $(LINK_FLAGS)
+objedit_LDADD = $(LINK_FLAGS)
+
EXTRA_DIST = \
gncal.desktop
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index f4c7ead95d..529b9cca23 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -3,7 +3,9 @@ INCLUDES = \
$(GNOME_INCLUDEDIR) \
-I../../gcalendar
-bin_PROGRAMS = gncal
+bin_PROGRAMS = gncal objedit
+
+objedit_SOURCES = objedit.c
gncal_SOURCES = \
gncal.c \
@@ -13,13 +15,16 @@ gncal_SOURCES = \
clist.c \
clist.h
-gncal_LDADD = \
+LINK_FLAGS = \
$(GNOME_LIBDIR) \
$(GNOMEUI_LIBS) \
$(INTLLIBS) \
../../gcalendar/gtkcalendar.o \
../../gcalendar/lib_date.o
+gncal_LDADD = $(LINK_FLAGS)
+objedit_LDADD = $(LINK_FLAGS)
+
EXTRA_DIST = \
gncal.desktop
diff --git a/calendar/timeutil.c b/calendar/timeutil.c
new file mode 100644
index 0000000000..2de1fa4b2b
--- /dev/null
+++ b/calendar/timeutil.c
@@ -0,0 +1,29 @@
+#include <glib.h>
+#include <time.h>
+
+#define digit_at(x,y) (x [y] - '0')
+
+time_t
+time_from_isodate (char *str)
+{
+ struct tm my_tm;
+
+ my_tm.tm_year = digit_at (str, 0) * 1000 + digit_at (str, 1) * 100 +
+ digit_at (str, 2) * 10 + digit_at (str, 3);
+
+ my_tm.tm_mon = digit_at (str, 4) * 10 + digit_at (str, 5);
+ my_tm.tm_mday = digit_at (str, 6) * 10 + digit_at (str, 7);
+ my_tm.tm_hour = digit_at (str, 9) * 10 + digit_at (str, 10);
+ my_tm.tm_min = digit_at (str, 11) * 10 + digit_at (str, 12);
+ my_tm.tm_sec = digit_at (str, 13) * 10 + digit_at (str, 14);
+ my_tm.tm_isdst = -1;
+
+ return mktime (&my_tm);
+}
+
+time_t
+time_from_start_duration (time_t start, char *duration)
+{
+ printf ("Not yet implemented\n");
+ return 0;
+}