From ddd8456b48f92798fbb5ace39729331c9496785c Mon Sep 17 00:00:00 2001
From: Stefan Becker <chemobejk@gmail.com>
Date: Sun, 11 Dec 2011 01:31:01 +0200
Subject: [PATCH] calendar: clean up API to remove dependency

Replace Http* with forward declarations in sipe-cal.h so that including
it doesn't require to include http-conn.h too.
---
 src/core/sipe-buddy.c   | 1 -
 src/core/sipe-cal.h     | 9 ++++++---
 src/core/sipe-core.c    | 1 -
 src/core/sipe-notify.c  | 1 -
 src/core/sipe-ocs2005.c | 1 -
 src/core/sipe-ocs2007.c | 1 -
 src/core/sipe-status.c  | 1 -
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/core/sipe-buddy.c b/src/core/sipe-buddy.c
index aa81844e..b879faa2 100644
--- a/src/core/sipe-buddy.c
+++ b/src/core/sipe-buddy.c
@@ -30,7 +30,6 @@
 #include <glib.h>
 
 #include "sipe-common.h"
-#include "http-conn.h" /* sipe-cal.h requires this */
 #include "sipmsg.h"
 #include "sip-csta.h"
 #include "sip-soap.h"
diff --git a/src/core/sipe-cal.h b/src/core/sipe-cal.h
index d5f2c035..92a5cd6f 100644
--- a/src/core/sipe-cal.h
+++ b/src/core/sipe-cal.h
@@ -22,6 +22,9 @@
  */
 
 /* Forward declarations */
+struct http_conn_auth;
+struct http_conn_struct;
+struct http_session_struct;
 struct sipe_buddy;
 struct sipe_core_private;
 struct _sipe_xml;
@@ -57,7 +60,7 @@ struct sipe_calendar {
 	int state;
 	char *email;
 	char *legacy_dn;
-	HttpConnAuth *auth;
+	struct http_conn_auth *auth;
 	int auto_disco_method;
 	int is_ews_disabled;
 	int is_domino_disabled;
@@ -75,8 +78,8 @@ struct sipe_calendar {
 	time_t updated;
 	gboolean published;
 
-	HttpSession *http_session;
-	HttpConn *http_conn;
+	struct http_session_struct *http_session;
+	struct http_conn_struct *http_conn;
 
 	time_t fb_start;
 	/* hex form */
diff --git a/src/core/sipe-core.c b/src/core/sipe-core.c
index 3152696e..795c3e6d 100644
--- a/src/core/sipe-core.c
+++ b/src/core/sipe-core.c
@@ -30,7 +30,6 @@
 #include <glib.h>
 
 #include "sipe-common.h"
-#include "http-conn.h" /* sipe-cal.h requires this */
 #include "sip-csta.h"
 #include "sip-sec.h"
 #include "sip-transport.h"
diff --git a/src/core/sipe-notify.c b/src/core/sipe-notify.c
index cd0215b2..c4a3ddf4 100644
--- a/src/core/sipe-notify.c
+++ b/src/core/sipe-notify.c
@@ -35,7 +35,6 @@
 #include <glib.h>
 
 #include "sipe-common.h"
-#include "http-conn.h" /* sipe-cal.h requires this */
 #include "sipmsg.h"
 #include "sip-csta.h"
 #include "sip-soap.h"
diff --git a/src/core/sipe-ocs2005.c b/src/core/sipe-ocs2005.c
index a3a16ef6..bb66ba80 100644
--- a/src/core/sipe-ocs2005.c
+++ b/src/core/sipe-ocs2005.c
@@ -30,7 +30,6 @@
 #include <glib.h>
 
 #include "sipe-common.h"
-#include "http-conn.h" /* sipe-cal.h requires this */
 #include "sip-soap.h"
 #include "sipe-backend.h"
 #include "sipe-buddy.h"
diff --git a/src/core/sipe-ocs2007.c b/src/core/sipe-ocs2007.c
index aa832cc3..e6611295 100644
--- a/src/core/sipe-ocs2007.c
+++ b/src/core/sipe-ocs2007.c
@@ -36,7 +36,6 @@
 #include <glib.h>
 
 #include "sipe-common.h"
-#include "http-conn.h"
 #include "sipmsg.h"
 #include "sip-csta.h"
 #include "sip-transport.h"
diff --git a/src/core/sipe-status.c b/src/core/sipe-status.c
index f5ca66f0..5a9ceb51 100644
--- a/src/core/sipe-status.c
+++ b/src/core/sipe-status.c
@@ -30,7 +30,6 @@
 #include <glib.h>
 
 #include "sipe-common.h"
-#include "http-conn.h" /* sipe-cal.h requires this */
 #include "sipe-backend.h"
 #include "sipe-cal.h"
 #include "sipe-core.h"
-- 
2.11.4.GIT