diff --git a/coreapi/vtables.c b/coreapi/vtables.c index 6a8691c02..b14221950 100644 --- a/coreapi/vtables.c +++ b/coreapi/vtables.c @@ -332,7 +332,7 @@ void linphone_core_remove_listener(LinphoneCore *lc, const LinphoneCoreVTable *v } } -bctbx_list_t *linphone_core_get_callbacks(const LinphoneCore *lc) { +bctbx_list_t *linphone_core_get_callbacks_list(const LinphoneCore *lc) { bctbx_list_t *result; bctbx_list_t *it; for(it=lc->vtable_refs; it!=NULL; it=it->next){ diff --git a/include/linphone/api/c-call.h b/include/linphone/api/c-call.h index 589056f19..fe3c2c768 100644 --- a/include/linphone/api/c-call.h +++ b/include/linphone/api/c-call.h @@ -756,13 +756,6 @@ LINPHONE_PUBLIC void linphone_call_add_callbacks(LinphoneCall *call, LinphoneCal */ LINPHONE_PUBLIC void linphone_call_remove_callbacks(LinphoneCall *call, LinphoneCallCbs *cbs); -/** - * Gets the list of listener in the call - * @param[in] call LinphoneCall object - * @return the list of LinphoneCallCbs - */ -LINPHONE_PUBLIC const bctbx_list_t *linphone_call_get_callbacks(const LinphoneCall *call); - /** * Gets the current LinphoneCallCbs. * This is meant only to be called from a callback to be able to get the user_data associated with the LinphoneCallCbs that is calling the callback. diff --git a/include/linphone/core.h b/include/linphone/core.h index 421e88e28..e78ba8e4c 100644 --- a/include/linphone/core.h +++ b/include/linphone/core.h @@ -975,14 +975,6 @@ LINPHONE_DEPRECATED LINPHONE_PUBLIC void linphone_core_remove_listener(LinphoneC */ LINPHONE_PUBLIC void linphone_core_remove_callbacks(LinphoneCore *lc, const LinphoneCoreCbs *cbs); -/** - * @ingroup initializing - * Gets the list of listener in the core - * @param lc The #LinphoneCore - * @return the list of LinphoneCoreCbs - */ -LINPHONE_PUBLIC bctbx_list_t *linphone_core_get_callbacks(const LinphoneCore *lc); - /** * Sets the user agent string used in SIP messages, ideally called just after linphone_core_new() or linphone_core_init(). * @param[in] lc LinphoneCore object diff --git a/include/linphone/wrapper_utils.h b/include/linphone/wrapper_utils.h index d9990aa50..35c335595 100644 --- a/include/linphone/wrapper_utils.h +++ b/include/linphone/wrapper_utils.h @@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef _WRAPPER_UTILS_H #define _WRAPPER_UTILS_H +#include +#include "linphone/defs.h" #include "linphone/types.h" #ifdef __cplusplus @@ -36,6 +38,22 @@ extern "C" { * @{ */ +/** + * @brief Gets the list of listener in the core. + * @param lc The #LinphoneCore. + * @return The list of #LinphoneCoreCbs. + * @donotwrap + */ +LINPHONE_PUBLIC bctbx_list_t *linphone_core_get_callbacks_list(const LinphoneCore *lc); + +/** + * @brief Gets the list of listener in the call. + * @param[in] call #LinphoneCall object. + * @return The list of #LinphoneCallCbs. + * @donotwrap + */ +LINPHONE_PUBLIC const bctbx_list_t *linphone_call_get_callbacks_list(const LinphoneCall *call); + /** * Send a message to peer member of this chat room. * diff --git a/src/c-wrapper/api/c-call.cpp b/src/c-wrapper/api/c-call.cpp index 47a6492cc..c6d722fae 100644 --- a/src/c-wrapper/api/c-call.cpp +++ b/src/c-wrapper/api/c-call.cpp @@ -1097,7 +1097,7 @@ LinphoneCallCbs *linphone_call_get_current_callbacks (const LinphoneCall *call) return call->currentCbs; } -const bctbx_list_t *linphone_call_get_callbacks(const LinphoneCall *call) { +const bctbx_list_t *linphone_call_get_callbacks_list(const LinphoneCall *call) { return call->callbacks; }