aboutsummaryrefslogtreecommitdiff
path: root/src/conversation
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-11-16 11:28:31 +0000
committerChristian Grothoff <christian@grothoff.org>2013-11-16 11:28:31 +0000
commit7a30700c97b1d94bb6d31b37bc7fd42b6ae7e3bf (patch)
tree64cb464db2851529f3f81ebbdeafdeb61b08d895 /src/conversation
parent82f3bd5a659c0e9880e5b7c367e3e996ebbc6800 (diff)
downloadgnunet-7a30700c97b1d94bb6d31b37bc7fd42b6ae7e3bf.tar.gz
gnunet-7a30700c97b1d94bb6d31b37bc7fd42b6ae7e3bf.zip
-doxygen fixes
Diffstat (limited to 'src/conversation')
-rw-r--r--src/conversation/conversation_api.c6
-rw-r--r--src/conversation/conversation_api_call.c14
2 files changed, 8 insertions, 12 deletions
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index 9a02811fe..aad272d9c 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -117,7 +117,7 @@ struct GNUNET_CONVERSATION_Caller
117 struct GNUNET_NAMESTORE_QueueEntry *qe; 117 struct GNUNET_NAMESTORE_QueueEntry *qe;
118 118
119 /** 119 /**
120 * Identity of the person calling us (valid while in state #PS_RINGING). 120 * Identity of the person calling us.
121 */ 121 */
122 struct GNUNET_CRYPTO_EcdsaPublicKey caller_id; 122 struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
123 123
@@ -806,7 +806,7 @@ GNUNET_CONVERSATION_phone_destroy (struct GNUNET_CONVERSATION_Phone *phone)
806 * and the microphone. The call can later be resumed with 806 * and the microphone. The call can later be resumed with
807 * #GNUNET_CONVERSATION_caller_resume. 807 * #GNUNET_CONVERSATION_caller_resume.
808 * 808 *
809 * @param phone phone to pause 809 * @param caller call to suspend
810 */ 810 */
811void 811void
812GNUNET_CONVERSATION_caller_suspend (struct GNUNET_CONVERSATION_Caller *caller) 812GNUNET_CONVERSATION_caller_suspend (struct GNUNET_CONVERSATION_Caller *caller)
@@ -837,7 +837,7 @@ GNUNET_CONVERSATION_caller_suspend (struct GNUNET_CONVERSATION_Caller *caller)
837/** 837/**
838 * Resume suspended conversation of a phone. 838 * Resume suspended conversation of a phone.
839 * 839 *
840 * @param phone phone to resume 840 * @param caller call to resume
841 * @param speaker speaker to use 841 * @param speaker speaker to use
842 * @param mic microphone to use 842 * @param mic microphone to use
843 */ 843 */
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c
index efd6a60de..25e60f0f3 100644
--- a/src/conversation/conversation_api_call.c
+++ b/src/conversation/conversation_api_call.c
@@ -537,10 +537,10 @@ reconnect_call (struct GNUNET_CONVERSATION_Call *call)
537 * @param caller_id identity of the caller 537 * @param caller_id identity of the caller
538 * @param callee GNS name of the callee (used to locate the callee's record) 538 * @param callee GNS name of the callee (used to locate the callee's record)
539 * @param speaker speaker to use (will be used automatically immediately once the 539 * @param speaker speaker to use (will be used automatically immediately once the
540 * #GNUNET_CONVERSATION_EC_READY event is generated); we will NOT generate 540 * #GNUNET_CONVERSATION_EC_CALL_PICKED_UP event is generated); we will NOT generate
541 * a ring tone on the speaker 541 * a ring tone on the speaker
542 * @param mic microphone to use (will be used automatically immediately once the 542 * @param mic microphone to use (will be used automatically immediately once the
543 * #GNUNET_CONVERSATION_EC_READY event is generated) 543 * #GNUNET_CONVERSATION_EC_CALL_PICKED_UP event is generated)
544 * @param event_handler how to notify the owner of the phone about events 544 * @param event_handler how to notify the owner of the phone about events
545 * @param event_handler_cls closure for @a event_handler 545 * @param event_handler_cls closure for @a event_handler
546 */ 546 */
@@ -595,8 +595,6 @@ finish_stop (void *cls)
595 * Terminate a call. The call may be ringing or ready at this time. 595 * Terminate a call. The call may be ringing or ready at this time.
596 * 596 *
597 * @param call call to terminate 597 * @param call call to terminate
598 * @param reason if the call was active (ringing or ready) this will be the
599 * reason given to the other user for why we hung up
600 */ 598 */
601void 599void
602GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call) 600GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call)
@@ -674,14 +672,12 @@ GNUNET_CONVERSATION_call_suspend (struct GNUNET_CONVERSATION_Call *call)
674 672
675 673
676/** 674/**
677 * Resumes a call after #GNUNET_CONVERSATION_call_pause. 675 * Resumes a call after #GNUNET_CONVERSATION_call_suspend.
678 * 676 *
679 * @param call call to resume 677 * @param call call to resume
680 * @param speaker speaker to use (will be used automatically immediately once the 678 * @param speaker speaker to use
681 * #GNUNET_CONVERSATION_EC_READY event is generated); we will NOT generate
682 * a ring tone on the speaker 679 * a ring tone on the speaker
683 * @param mic microphone to use (will be used automatically immediately once the 680 * @param mic microphone to use
684 * #GNUNET_CONVERSATION_EC_READY event is generated)
685 */ 681 */
686void 682void
687GNUNET_CONVERSATION_call_resume (struct GNUNET_CONVERSATION_Call *call, 683GNUNET_CONVERSATION_call_resume (struct GNUNET_CONVERSATION_Call *call,