From f779be584cb9f12a30300300a2ba5797da7637b0 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 7 Oct 2013 10:57:25 +0200
Subject: [PATCH] Deprecate linphone_call_is_in_conference() and
 linphone_proxy_config_is_registered().

---
 coreapi/linphonecall.c | 4 ----
 coreapi/linphonecore.h | 7 ++++---
 coreapi/proxy.c        | 1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 3f2102445..103492b4f 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2530,10 +2530,6 @@ void linphone_call_set_transfer_state(LinphoneCall* call, LinphoneCallState stat
 	}
 }
 
-/**
- * Returns true if the call is part of the conference.
- * @ingroup conferencing
-**/
 bool_t linphone_call_is_in_conference(const LinphoneCall *call) {
 	return call->params.in_conference;
 }
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index f3c2a070d..4fc6205b4 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -573,10 +573,11 @@ LINPHONE_PUBLIC	void linphone_call_start_recording(LinphoneCall *call);
 LINPHONE_PUBLIC	void linphone_call_stop_recording(LinphoneCall *call);
 /**
  * Return TRUE if this call is currently part of a conference
- *@param call #LinphoneCall
- *@return TRUE if part of a conference.
+ * @param call #LinphoneCall
+ * @return TRUE if part of a conference.
  *
- @ingroup call_control
+ * @deprecated
+ * @ingroup call_control
  */
 LINPHONE_PUBLIC	bool_t linphone_call_is_in_conference(const LinphoneCall *call);
 /**
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 94ea34908..fcfdc6697 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -93,6 +93,7 @@ void linphone_proxy_config_destroy(LinphoneProxyConfig *obj){
 
 /**
  * Returns a boolean indicating that the user is sucessfully registered on the proxy.
+ * @deprecated Use linphone_proxy_config_get_state() instead.
 **/
 bool_t linphone_proxy_config_is_registered(const LinphoneProxyConfig *obj){
 	return obj->state == LinphoneRegistrationOk;