From 3dc58012831d75d6622d2992aeeecdcdc269f639 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 1 Aug 2014 14:40:38 +0200 Subject: [PATCH] Follow naming conventions of linphone core callbacks. --- coreapi/chat.c | 8 ++++---- coreapi/help/filetransfer.c | 2 +- coreapi/linphonecore.h | 2 +- tester/tester.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coreapi/chat.c b/coreapi/chat.c index 6679d9034..165d71ac3 100644 --- a/coreapi/chat.c +++ b/coreapi/chat.c @@ -994,8 +994,8 @@ static void on_recv_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t return; } /* call back given by application level */ - if (lc->vtable.file_transfer_received != NULL) { - lc->vtable.file_transfer_received(lc, chatMsg, chatMsg->file_transfer_information, (char *)buffer, size); + if (lc->vtable.file_transfer_recv != NULL) { + lc->vtable.file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, (char *)buffer, size); } return; } @@ -1061,8 +1061,8 @@ static void linphone_chat_process_response_from_get_file(void *data, const belle LinphoneChatMessage* chatMsg=(LinphoneChatMessage *)data; LinphoneCore *lc = chatMsg->chat_room->lc; /* file downloaded succesfully, call again the callback with size at zero */ - if (lc->vtable.file_transfer_received != NULL) { - lc->vtable.file_transfer_received(lc, chatMsg, chatMsg->file_transfer_information, NULL, 0); + if (lc->vtable.file_transfer_recv != NULL) { + lc->vtable.file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, NULL, 0); } } } diff --git a/coreapi/help/filetransfer.c b/coreapi/help/filetransfer.c index 5e8c2054b..25edc2d39 100644 --- a/coreapi/help/filetransfer.c +++ b/coreapi/help/filetransfer.c @@ -162,7 +162,7 @@ int main(int argc, char *argv[]){ in order to get notifications about incoming file receive, file_transfer_send to feed file to be transfered and file_transfer_progress_indication to print progress. */ - vtable.file_transfer_received=file_transfer_received; + vtable.file_transfer_recv=file_transfer_received; vtable.file_transfer_send=file_transfer_send; vtable.file_transfer_progress_indication=file_transfer_progress_indication; vtable.message_received=message_received; diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 0c9358094..5e842ac59 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -1604,7 +1604,7 @@ typedef struct _LinphoneCoreVTable{ DisplayUrlCb display_url; /**< @deprecated */ ShowInterfaceCb show; /**< @deprecated Notifies the application that it should show up*/ LinphoneCoreTextMessageReceivedCb text_received; /** @deprecated, use #message_received instead
A text message has been received */ - LinphoneCoreFileTransferRecvCb file_transfer_received; /** Callback to store file received attached to a #LinphoneChatMessage */ + LinphoneCoreFileTransferRecvCb file_transfer_recv; /** Callback to store file received attached to a #LinphoneChatMessage */ LinphoneCoreFileTransferSendCb file_transfer_send; /** Callback to collect file chunk to be sent for a #LinphoneChatMessage */ LinphoneCoreFileTransferProgressIndicationCb file_transfer_progress_indication; /**Callback to indicate file transfer progress*/ } LinphoneCoreVTable; diff --git a/tester/tester.c b/tester/tester.c index 475d2c90f..d0faca038 100644 --- a/tester/tester.c +++ b/tester/tester.c @@ -199,7 +199,7 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f mgr->v_table.call_state_changed=call_state_changed; mgr->v_table.text_received=text_message_received; mgr->v_table.message_received=message_received; - mgr->v_table.file_transfer_received=file_transfer_received; + mgr->v_table.file_transfer_recv=file_transfer_received; mgr->v_table.file_transfer_send=file_transfer_send; mgr->v_table.file_transfer_progress_indication=file_transfer_progress_indication; mgr->v_table.is_composing_received=is_composing_received;