From 071581ffacb81623d1c3eb5476dbb2021c136336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Mon, 18 Jan 2016 12:01:48 +0100
Subject: [PATCH] Declare LinphoneConference and LinphoneConferenceParams in
 conference.h instead of linphonecore.h

---
 coreapi/CMakeLists.txt |  1 +
 coreapi/Makefile.am    |  3 ++-
 coreapi/conference.h   | 11 +++++++++++
 coreapi/linphonecore.h | 14 ++------------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index f53b41c06..ba5277382 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -35,6 +35,7 @@ set(LINPHONE_HEADER_FILES
 	buffer.h
 	call_log.h
 	call_params.h
+	conference.h
 	content.h
 	event.h
 	friendlist.h
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 0dd8febe0..353071c07 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -29,6 +29,7 @@ linphone_include_HEADERS=\
 	buffer.h \
 	call_log.h \
 	call_params.h \
+	conference.h \
 	content.h \
 	event.h \
 	friendlist.h \
@@ -57,7 +58,7 @@ liblinphone_la_SOURCES=\
 	call_params.c \
 	chat.c \
 	chat_file_transfer.c \
-	conference.cc conference.h conference_private.h \
+	conference.cc conference_private.h \
 	contactprovider.c contactprovider.h contact_providers_priv.h \
 	content.c \
 	dict.c \
diff --git a/coreapi/conference.h b/coreapi/conference.h
index 90da4b0b7..a043a8a33 100644
--- a/coreapi/conference.h
+++ b/coreapi/conference.h
@@ -37,6 +37,11 @@ extern "C" {
  * @{
  */
 
+/**
+ * Parameters for initialization of conferences
+ */
+typedef struct _LinphoneCorferenceParams LinphoneConferenceParams;
+
 /**
  * Create a #LinphoneConferenceParams with default parameters set.
  * @param core #LinphoneCore to use to find out the default parameters. Can be NULL.
@@ -67,6 +72,12 @@ LINPHONE_PUBLIC void linphone_conference_params_enable_video(LinphoneConferenceP
 LINPHONE_PUBLIC bool_t linphone_conference_params_video_requested(const LinphoneConferenceParams *params);
 
 
+
+/**
+ * LinphoneConference class
+ */
+typedef struct _LinphoneConference LinphoneConference;
+
 /**
  * Remove a participant from a conference
  * @param obj A #LinphoneConference
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 07ce58813..6fa40625a 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -66,18 +66,6 @@ struct _LinphoneInfoMessage;
  */
 typedef struct _LinphoneCore LinphoneCore;
 
-/**
- * Internal object of LinphoneCore representing a conference
- * @ingroup call_control
- */
-typedef struct _LinphoneConference LinphoneConference;
-
-/**
- * Parameters for initialization of conferences
- * @ingroup call_control
- */
-typedef struct _LinphoneCorferenceParams LinphoneConferenceParams;
-
 
 /**
  * Disable a sip transport
@@ -423,6 +411,7 @@ LINPHONE_PUBLIC const char* linphone_privacy_to_string(LinphonePrivacy privacy);
 #include "event.h"
 #include "linphonefriend.h"
 #include "xmlrpc.h"
+#include "conference.h"
 #else
 #include "linphone/buffer.h"
 #include "linphone/call_log.h"
@@ -431,6 +420,7 @@ LINPHONE_PUBLIC const char* linphone_privacy_to_string(LinphonePrivacy privacy);
 #include "linphone/event.h"
 #include "linphone/linphonefriend.h"
 #include "linphone/xmlrpc.h"
+#include "linphone/conference.h"
 #endif
 
 LINPHONE_PUBLIC	LinphoneAddress * linphone_address_new(const char *addr);