From 9a5253de5286ec70f877298d305517b7566134bb Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 3 Aug 2016 11:23:33 +0200 Subject: [PATCH] Really fix the automatic wrapper generation (the 'Cbs' in callback name is important, do not remove it!). --- coreapi/account_creator.c | 24 ++++++++++++------------ coreapi/account_creator.h | 26 +++++++++++++------------- coreapi/private.h | 12 ++++++------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/coreapi/account_creator.c b/coreapi/account_creator.c index 5705cb2ec..35dc3be52 100644 --- a/coreapi/account_creator.c +++ b/coreapi/account_creator.c @@ -61,51 +61,51 @@ void linphone_account_creator_cbs_set_user_data(LinphoneAccountCreatorCbs *cbs, cbs->user_data = ud; } -LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_is_account_used(const LinphoneAccountCreatorCbs *cbs) { +LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_used(const LinphoneAccountCreatorCbs *cbs) { return cbs->is_account_used; } -void linphone_account_creator_cbs_set_is_account_used(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb) { +void linphone_account_creator_cbs_set_is_account_used(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) { cbs->is_account_used = cb; } -LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_create_account(const LinphoneAccountCreatorCbs *cbs) { +LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_create_account(const LinphoneAccountCreatorCbs *cbs) { return cbs->create_account; } -void linphone_account_creator_cbs_set_create_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb) { +void linphone_account_creator_cbs_set_create_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) { cbs->create_account = cb; } -LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_activate_account(const LinphoneAccountCreatorCbs *cbs) { +LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_activate_account(const LinphoneAccountCreatorCbs *cbs) { return cbs->activate_account; } -void linphone_account_creator_cbs_set_activate_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb) { +void linphone_account_creator_cbs_set_activate_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) { cbs->activate_account = cb; } -LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_link_phone_number_with_account(const LinphoneAccountCreatorCbs *cbs) { +LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_link_phone_number_with_account(const LinphoneAccountCreatorCbs *cbs) { return cbs->link_phone_number_with_account; } -void linphone_account_creator_cbs_set_link_phone_number_with_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb) { +void linphone_account_creator_cbs_set_link_phone_number_with_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) { cbs->link_phone_number_with_account = cb; } -LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_activate_phone_number_link(const LinphoneAccountCreatorCbs *cbs) { +LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_activate_phone_number_link(const LinphoneAccountCreatorCbs *cbs) { return cbs->activate_phone_number_link; } -void linphone_account_creator_cbs_set_activate_phone_number_link(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb) { +void linphone_account_creator_cbs_set_activate_phone_number_link(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) { cbs->activate_phone_number_link = cb; } -LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_is_account_activated(const LinphoneAccountCreatorCbs *cbs) { +LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_activated(const LinphoneAccountCreatorCbs *cbs) { return cbs->is_account_activated; } -void linphone_account_creator_cbs_set_is_account_activated(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb) { +void linphone_account_creator_cbs_set_is_account_activated(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) { cbs->is_account_activated = cb; } diff --git a/coreapi/account_creator.h b/coreapi/account_creator.h index 4cde6a236..f19865faf 100644 --- a/coreapi/account_creator.h +++ b/coreapi/account_creator.h @@ -79,7 +79,7 @@ typedef struct _LinphoneAccountCreatorCbs LinphoneAccountCreatorCbs; * @param[in] creator LinphoneAccountCreator object * @param[in] status The status of the LinphoneAccountCreator test existence operation that has just finished **/ -typedef void (*LinphoneAccountCreatorStatusCb)(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status); +typedef void (*LinphoneAccountCreatorCbsStatusCb)(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status); /** * Create a LinphoneAccountCreator. @@ -332,84 +332,84 @@ LINPHONE_PUBLIC void linphone_account_creator_cbs_set_user_data(LinphoneAccountC * @param[in] cbs LinphoneAccountCreatorCbs object. * @return The current existence tested callback. **/ -LINPHONE_PUBLIC LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_is_account_used(const LinphoneAccountCreatorCbs *cbs); +LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_used(const LinphoneAccountCreatorCbs *cbs); /** * Set the existence tested callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @param[in] cb The existence tested callback to be used. **/ -LINPHONE_PUBLIC void linphone_account_creator_cbs_set_is_account_used(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb); +LINPHONE_PUBLIC void linphone_account_creator_cbs_set_is_account_used(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb); /** * Get the create account callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @return The current create account callback. **/ -LINPHONE_PUBLIC LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_create_account(const LinphoneAccountCreatorCbs *cbs); +LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_create_account(const LinphoneAccountCreatorCbs *cbs); /** * Set the create account callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @param[in] cb The create account callback to be used. **/ -LINPHONE_PUBLIC void linphone_account_creator_cbs_set_create_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb); +LINPHONE_PUBLIC void linphone_account_creator_cbs_set_create_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb); /** * Get the activate account callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @return The current activate account callback. **/ -LINPHONE_PUBLIC LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_activate_account(const LinphoneAccountCreatorCbs *cbs); +LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_activate_account(const LinphoneAccountCreatorCbs *cbs); /** * Set the activate account callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @param[in] cb The activate account callback to be used. **/ -LINPHONE_PUBLIC void linphone_account_creator_cbs_set_activate_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb); +LINPHONE_PUBLIC void linphone_account_creator_cbs_set_activate_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb); /** * Get the link phone number with account callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @return The current link phone number with account callback. **/ -LINPHONE_PUBLIC LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_link_phone_number_with_account(const LinphoneAccountCreatorCbs *cbs); +LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_link_phone_number_with_account(const LinphoneAccountCreatorCbs *cbs); /** * Set the link phone number with account callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @param[in] cb The link phone number with account callback to be used. **/ -LINPHONE_PUBLIC void linphone_account_creator_cbs_set_link_phone_number_with_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb); +LINPHONE_PUBLIC void linphone_account_creator_cbs_set_link_phone_number_with_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb); /** * Get the activate phone number link callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @return The current activate phone number link callback. **/ -LINPHONE_PUBLIC LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_activate_phone_number_link(const LinphoneAccountCreatorCbs *cbs); +LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_activate_phone_number_link(const LinphoneAccountCreatorCbs *cbs); /** * Set the activate phone number link callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @param[in] cb The activate phone number link callback to be used. **/ -LINPHONE_PUBLIC void linphone_account_creator_cbs_set_activate_phone_number_link(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb); +LINPHONE_PUBLIC void linphone_account_creator_cbs_set_activate_phone_number_link(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb); /** * Get the validation tested callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @return The current validation tested callback. **/ -LINPHONE_PUBLIC LinphoneAccountCreatorStatusCb linphone_account_creator_cbs_get_is_account_activated(const LinphoneAccountCreatorCbs *cbs); +LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_activated(const LinphoneAccountCreatorCbs *cbs); /** * Set the validation tested callback. * @param[in] cbs LinphoneAccountCreatorCbs object. * @param[in] cb The validation tested callback to be used. **/ -LINPHONE_PUBLIC void linphone_account_creator_cbs_set_is_account_activated(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorStatusCb cb); +LINPHONE_PUBLIC void linphone_account_creator_cbs_set_is_account_activated(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb); /** * @} diff --git a/coreapi/private.h b/coreapi/private.h index 7e3514975..3e4b09631 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -1280,13 +1280,13 @@ BELLE_SIP_DECLARE_VPTR(LinphoneXmlRpcSession); struct _LinphoneAccountCreatorCbs { belle_sip_object_t base; void *user_data; - LinphoneAccountCreatorStatusCb is_account_used; - LinphoneAccountCreatorStatusCb create_account; - LinphoneAccountCreatorStatusCb activate_account; - LinphoneAccountCreatorStatusCb is_account_activated; + LinphoneAccountCreatorCbsStatusCb is_account_used; + LinphoneAccountCreatorCbsStatusCb create_account; + LinphoneAccountCreatorCbsStatusCb activate_account; + LinphoneAccountCreatorCbsStatusCb is_account_activated; - LinphoneAccountCreatorStatusCb link_phone_number_with_account; - LinphoneAccountCreatorStatusCb activate_phone_number_link; + LinphoneAccountCreatorCbsStatusCb link_phone_number_with_account; + LinphoneAccountCreatorCbsStatusCb activate_phone_number_link; }; BELLE_SIP_DECLARE_VPTR(LinphoneAccountCreatorCbs);