[Xfce4-commits] <orage:master> 4.5.7.18: Fix for bug 6288: wrong path to libical include files

[Juha Kautto]

Updating branch refs/heads/master
         to f8484189b6a39ab15845baa6fdb31f63e2908b42 (commit)
       from 51bc004878b82ea625e8955bf614455c894e4c86 (commit)

commit f8484189b6a39ab15845baa6fdb31f63e2908b42
Author: Juha Kautto <juha at xfce.org>
Date:   Thu Mar 11 13:13:37 2010 +0200

    4.5.7.18: Fix for bug 6288: wrong path to libical include files
    
    Fixed <ical.h> to be <libical/ical.h> if os package is being used.

 configure.in.in    |    2 +-
 src/ical-archive.c |    5 +++++
 src/ical-code.c    |    5 +++++
 src/ical-expimp.c  |    5 +++++
 4 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 1d60511..1e89f5c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.7.5.17-git])
+m4_define([orage_version], [4.7.5.18-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/ical-archive.c b/src/ical-archive.c
index 100be99..7ed3b87 100644
--- a/src/ical-archive.c
+++ b/src/ical-archive.c
@@ -51,8 +51,13 @@
 #include <gtk/gtk.h>
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
+#ifdef HAVE_LIBICAL
+#include <libical/ical.h>
+#include <libical/icalss.h>
+#else
 #include <ical.h>
 #include <icalss.h>
+#endif
 
 #include "orage-i18n.h"
 #include "functions.h"
diff --git a/src/ical-code.c b/src/ical-code.c
index 6f058ac..f9c8275 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -51,8 +51,13 @@
 #include <gtk/gtk.h>
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
+#ifdef HAVE_LIBICAL
+#include <libical/ical.h>
+#include <libical/icalss.h>
+#else
 #include <ical.h>
 #include <icalss.h>
+#endif
 
 #include "orage-i18n.h"
 #include "functions.h"
diff --git a/src/ical-expimp.c b/src/ical-expimp.c
index 9bda162..73e23c3 100644
--- a/src/ical-expimp.c
+++ b/src/ical-expimp.c
@@ -51,8 +51,13 @@
 #include <gtk/gtk.h>
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
+#ifdef HAVE_LIBICAL
+#include <libical/ical.h>
+#include <libical/icalss.h>
+#else
 #include <ical.h>
 #include <icalss.h>
+#endif
 
 #include "orage-i18n.h"
 #include "functions.h"