aboutsummaryrefslogtreecommitdiffstats
path: root/libical
diff options
context:
space:
mode:
authornobody <nobody@localhost>2002-05-07 05:31:34 +0800
committernobody <nobody@localhost>2002-05-07 05:31:34 +0800
commitd09835c67aed858a255aab0654afb9cf92104c14 (patch)
tree9b1d5ff0e376003bf6dc62eadedf6603302862eb /libical
parent0425bffaf1c34bb5a547ceacc64ba6b71a005ac0 (diff)
downloadgsoc2013-evolution-EVOLUTION_1_0_5.tar.gz
gsoc2013-evolution-EVOLUTION_1_0_5.tar.zst
gsoc2013-evolution-EVOLUTION_1_0_5.zip
This commit was manufactured by cvs2svn to create tagEVOLUTION_1_0_5
'EVOLUTION_1_0_5'. svn path=/tags/EVOLUTION_1_0_5/; revision=16695
Diffstat (limited to 'libical')
-rw-r--r--libical/ChangeLog55
-rw-r--r--libical/configure.in1
-rw-r--r--libical/design-data/parameters.csv2
-rw-r--r--libical/src/Makefile.am2
-rw-r--r--libical/src/libical/icalyacc.y2
-rw-r--r--libical/src/libicalvcal/Makefile.am25
-rw-r--r--libical/src/libicalvcal/vcc.y27
7 files changed, 23 insertions, 91 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index d69a377318..2ecd0248d7 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,54 +1,11 @@
-2002-04-01 Dan Winship <danw@ximian.com>
+2001-12-18 Dan Winship <danw@ximian.com>
- Darwin/OS portability from Max Horn <max@quendi.de>
-
- * src/libical/icallangbind.c: #include <stdlib.h>, not <malloc.h>
-
- * src/libicalvcal/vobject.c: Likewise
-
- * src/libicalvcal/vcc.y: Likewise
-
- * src/libicalss/icaldirset.c: Rearrange #includes slightly to make
- Darwin happy.
-
-2002-02-08 Damon Chaplin <damon@ximian.com>
-
- * src/Makefile.am (SUBDIRS): added libicalvcal.
-
- * configure.in (AC_OUTPUT): added src/libicalvcal/Makefile.
-
-2002-02-06 Damon Chaplin <damon@ximian.com>
-
- * src/libicalvcal/icalvcal.c: major changes to support RRULE/EXRULE,
- VALARMS and several other properties.
-
- * src/libicalvcal/icalvcal.h (icalvcal_convert_with_defaults): new
- function to pass defaults for a few values into the importer. These
- are used when the vCalendar file doesn't provide the property but it
- is required in iCalendar.
-
- * src/libicalvcal/vcc.y: support multi-valued properties, by appending
- new ones and separating by ';'. This was pinched from our changes to
- evolution/libversit/vcc.y.
-
- * src/libicalvcal/Makefile.am: renamed library to libicalvcal-evolution
- Don't install the headers.
-
- * design-data/parameters.csv: added new error for error's parsing
- vCalendar properties.
-
-2002-01-28 Dan Winship <danw@ximian.com>
-
- * src/libical/icalrecur.c (icalrecur_add_bydayrules): Skip over
- illegal whitespace in Microsoft-generated BYDAY rules.
-
-2001-12-18 Damon Chaplin <damon@ximian.com>
-
- * src/libical/icalyacc.y: removed unused 'trigger:' production.
+ * configure.in (AC_OUTPUT): Remove src/libicalss/Makefile and
+ src/libicalvcal/Makefile since we don't build those any more. From
+ Jeremy Katz (katzj@redhat.com). #17606.
- * configure.in (AC_OUTPUT): patch from Jeremy Katz <katzj@redhat.com>
- to remove src/libicalss/Makefile and src/libicalvcal/Makefile, as we
- don't ship those directories now.
+ * src/libical/icalyacc.y: Remove an unused rule since bison 1.30
+ apparently considers this an error. #17531.
2001-12-10 Damon Chaplin <damon@ximian.com>
diff --git a/libical/configure.in b/libical/configure.in
index a07b8be2b3..df88303e14 100644
--- a/libical/configure.in
+++ b/libical/configure.in
@@ -94,7 +94,6 @@ scripts/Makefile
src/Makefile
src/libical/Makefile
src/libical/icalversion.h
-src/libicalvcal/Makefile
test-data/Makefile
zoneinfo/Makefile
])
diff --git a/libical/design-data/parameters.csv b/libical/design-data/parameters.csv
index f223b415a8..c71eb115eb 100644
--- a/libical/design-data/parameters.csv
+++ b/libical/design-data/parameters.csv
@@ -20,5 +20,5 @@
"TZID","const char*",
"VALUE","icalparameter_value","BINARY;BOOLEAN;DATE;DURATION;FLOAT;INTEGER;PERIOD;RECUR;TEXT;TIME;URI;ERROR;DATE-TIME;UTC-OFFSET;CAL-ADDRESS"
"X","const char*",
-"X-LIC-ERRORTYPE","icalparameter_xlicerrortype","COMPONENT-PARSE-ERROR;PROPERTY-PARSE-ERROR;PARAMETER-NAME-PARSE-ERROR;PARAMETER-VALUE-PARSE-ERROR;VALUE-PARSE-ERROR;INVALID-ITIP;UNKNOWN-VCAL-PROP-ERROR;MIME-PARSE-ERROR;VCAL-PROP-PARSE-ERROR"
+"X-LIC-ERRORTYPE","icalparameter_xlicerrortype","COMPONENT-PARSE-ERROR;PROPERTY-PARSE-ERROR;PARAMETER-NAME-PARSE-ERROR;PARAMETER-VALUE-PARSE-ERROR;VALUE-PARSE-ERROR;INVALID-ITIP;UNKNOWN-VCAL-PROP-ERROR;MIME-PARSE-ERROR"
"X-LIC-COMPARETYPE","icalparameter_xliccomparetype","EQUAL;NOTEQUAL;LESS;GREATER;LESSEQUAL;GREATEREQUAL;REGEX"
diff --git a/libical/src/Makefile.am b/libical/src/Makefile.am
index 7a3f9fcdff..fea649ac50 100644
--- a/libical/src/Makefile.am
+++ b/libical/src/Makefile.am
@@ -5,5 +5,5 @@ PYTHON_DIR =
endif
# For evolution we only build libical at present.
-SUBDIRS = libical libicalvcal
+SUBDIRS = libical
#SUBDIRS = libical libicalss libicalvcal # $(PYTHON_DIR) test
diff --git a/libical/src/libical/icalyacc.y b/libical/src/libical/icalyacc.y
index 87bcb3bec5..bf732a204e 100644
--- a/libical/src/libical/icalyacc.y
+++ b/libical/src/libical/icalyacc.y
@@ -6,7 +6,7 @@
DESCRIPTION:
- $Id: icalyacc.y,v 1.13 2001/12/18 20:08:31 damon Exp $
+ $Id: icalyacc.y,v 1.12.12.1 2001/12/18 20:16:48 danw Exp $
$Locker: $
(C) COPYRIGHT 1999 Eric Busboom
diff --git a/libical/src/libicalvcal/Makefile.am b/libical/src/libicalvcal/Makefile.am
index e8e8310941..c409347d14 100644
--- a/libical/src/libicalvcal/Makefile.am
+++ b/libical/src/libicalvcal/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libicalvcal-evolution.la
+lib_LTLIBRARIES = libicalvcal.la
INCLUDES = \
-I$(top_builddir) \
@@ -6,27 +6,22 @@ INCLUDES = \
-I$(top_builddir)/src/libical \
-I$(top_srcdir)/src/libicalss
-libicalvcal_evolution_la_LDFLAGS = -version-info 0:0:0
+libicalvcal_la_LDFLAGS = -version-info 0:0:0
-libicalvcal_evolution_la_SOURCES = \
- icalvcal.h \
+libicalvcal_la_SOURCES = \
icalvcal.c \
- port.h \
- vcc.h \
vcc.y \
- vobject.h \
vobject.c \
- vcaltmp.h \
vcaltmp.c
-#libicalvcalincludedir = $(includedir)/evolution/libicalvcal
+libicalvcalincludedir = $(includedir)/libicalvcal
-#libicalvcalinclude_HEADERS = \
-# icalvcal.h \
-# port.h \
-# vcc.h \
-# vobject.h \
-# vcaltmp.h
+libicalvcalinclude_HEADERS = \
+ icalvcal.h \
+ port.h \
+ vcc.h \
+ vobject.h \
+ vcaltmp.h
EXTRA_DIST = \
README.TXT \
diff --git a/libical/src/libicalvcal/vcc.y b/libical/src/libicalvcal/vcc.y
index 95d5858d81..70feefab57 100644
--- a/libical/src/libicalvcal/vcc.y
+++ b/libical/src/libicalvcal/vcc.y
@@ -107,6 +107,9 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
#endif
#include <string.h>
+#ifndef __MWERKS__
+#include <malloc.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -411,31 +414,9 @@ static void enterValues(const char *value)
}
else {
if (value) {
- char *p1, *p2;
- wchar_t *p3;
- int i;
-
- /* If the property already has a string value, we append this one,
- using ';' to separate the values. */
- if (vObjectUStringZValue(curProp)) {
- p1 = fakeCString(vObjectUStringZValue(curProp));
- p2 = malloc((strlen(p1)+strlen(value)+1));
- strcpy(p2, p1);
- deleteStr(p1);
-
- i = strlen(p2);
- p2[i] = ';';
- p2[i+1] = '\0';
- p2 = strcat(p2, value);
- p3 = (wchar_t *) vObjectUStringZValue(curProp);
- free(p3);
- setVObjectUStringZValue_(curProp,fakeUnicode(p2,0));
- deleteStr(p2);
- } else {
- setVObjectUStringZValue_(curProp,fakeUnicode(value,0));
+ setVObjectUStringZValue_(curProp,fakeUnicode(value,0));
}
}
- }
deleteStr(value);
}
generated by cgit (git 2.34.1) at 2025-04-22 07:52:33 +0800