Import new libical from mainline HEAD and make appropriate changes to

Evolution.

svn path=/trunk/; revision=22538

1 files changed, 44 insertions, 0 deletions

diff --git a/libical/src/libicalcap/icalcap.c b/libical/src/libicalcap/icalcap.c
new file mode 100644
index 0000000000..8d404f0ad4
--- /dev/null
+++ b/libical/src/libicalcap/icalcap.c
@@ -0,0 +1,44 @@
+#include "config.h"
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "icalcap.h"
+#include "icalcap_impl.h"
+#include "icalcap_session_impl.h"	/* FIXME */
+
+
+void
+icalcap_free(icalcap *cap) {
+
+#ifdef WITH_RR
+	icalcap_free_rr(cap);
+#endif
+}
+
+int
+icalcap_stop(icalcap *cap) {
+
+#ifdef WITH_RR
+	return icalcap_stop_rr(cap);
+#else
+	return 0;
+#endif
+}
+
+const char *
+icalcap_get_username(const icalcap *cap) {
+
+#ifdef WITH_RR
+	if (cap == NULL || cap->username == NULL)
+		return NULL;
+
+	return cap->username;
+#else
+	return NULL;
+#endif
+}