diff --git a/CMakeLists.txt b/CMakeLists.txt index f841c7148..20901f42d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,14 +21,14 @@ ############################################################################ cmake_minimum_required(VERSION 3.0) -project(linphone VERSION 3.9.1 LANGUAGES C CXX) +project(linphone VERSION 3.10.0 LANGUAGES C CXX) set(LINPHONE_MAJOR_VERSION ${PROJECT_VERSION_MAJOR}) set(LINPHONE_MINOR_VERSION ${PROJECT_VERSION_MINOR}) set(LINPHONE_MICRO_VERSION ${PROJECT_VERSION_PATCH}) set(LINPHONE_VERSION ${PROJECT_VERSION}) -set(LINPHONE_SO_VERSION "8") +set(LINPHONE_SO_VERSION "9") file(GLOB LINPHONE_PO_FILES RELATIVE "${CMAKE_CURRENT_LIST_DIR}/po" "${CMAKE_CURRENT_LIST_DIR}/po/*.po") string(REGEX REPLACE "([a-zA-Z_]+)\\.po" "\\1" LINPHONE_ALL_LANGS_LIST "${LINPHONE_PO_FILES}") diff --git a/COPYING b/COPYING index 365b8c279..ce1d99769 100644 --- a/COPYING +++ b/COPYING @@ -349,7 +349,7 @@ About The Cisco-Provided Binary of OpenH264 Video Codec Cisco provides this program under the terms of the BSD license. -Additionally, this binary is licensed under Cisco’s AVC/H.264 Patent Portfolio +Additionally, this binary is licensed under Cisco's AVC/H.264 Patent Portfolio License from MPEG LA, at no cost to you, provided that the requirements and conditions shown below in the AVC/H.264 Patent Portfolio sections are met. @@ -367,7 +367,7 @@ BSD terms, which can be found at http://www.openh264.org BSD License ----------- -Copyright © 2014 Cisco Systems, Inc. +Copyright (C) 2014 Cisco Systems, Inc. All rights reserved. diff --git a/NEWS b/NEWS index 67738b71e..8865e1034 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ -linphone-3.10.0 -- May xxth, 2016 +linphone-3.10.0 -- August 8th, 2016 + * Adding lime_experimental_feature : set to 1 in .linphonerc [GtkUi] to + show the Lime menu in the graphical user interface. Caution : Experimental. * Video conference support through a conference server (SDK only) * Disable dummy STUN packets sending when ICE is activated. * Signal AVPF support as AVP : Enable rtcp feedback on RTP/AVP by default diff --git a/configure.ac b/configure.ac index 234d42b29..0b59d4792 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.9.1],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.10.0],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([coreapi/linphonecore.c]) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 8ecfe062d..f52142890 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -8158,4 +8158,4 @@ extern "C" jobject Java_org_linphone_core_LinphoneAccountCreatorImpl_configure(J LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc); LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table); return getProxy(env, lpc, lcData->core); -} \ No newline at end of file +} diff --git a/coreapi/vcard.cc b/coreapi/vcard.cc index 3d9418990..04fc99a6a 100644 --- a/coreapi/vcard.cc +++ b/coreapi/vcard.cc @@ -392,4 +392,4 @@ bool_t linphone_core_vcard_supported(void) { #ifdef __cplusplus } -#endif +#endif \ No newline at end of file diff --git a/coreapi/vcard_stubs.c b/coreapi/vcard_stubs.c index 3d20ca2d6..dbb5533d0 100644 --- a/coreapi/vcard_stubs.c +++ b/coreapi/vcard_stubs.c @@ -35,6 +35,7 @@ void linphone_vcard_context_destroy(LinphoneVcardContext *context) { } } + void* linphone_vcard_context_get_user_data(const LinphoneVcardContext *context) { return context ? context->user_data : NULL; } diff --git a/gtk/config-fetching.c b/gtk/config-fetching.c index 44cc8bc21..6e3dbef91 100644 --- a/gtk/config-fetching.c +++ b/gtk/config-fetching.c @@ -36,12 +36,30 @@ void linphone_gtk_config_uri_changed(GtkWidget *button){ if (uri && (strlen(uri)==0 || strcmp(uri,"https://")==0)) uri=NULL; - linphone_core_set_provisioning_uri(linphone_gtk_get_core(),uri); - gtk_widget_destroy(w); - - if (uri){ - linphone_gtk_schedule_restart(); - gtk_main_quit(); + if(linphone_core_set_provisioning_uri(linphone_gtk_get_core(),uri) == 0) { + gtk_widget_destroy(w); + if (uri){ +#ifndef _WIN32 + linphone_gtk_schedule_restart(); + gtk_main_quit(); +#else + GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(linphone_gtk_get_main_window()), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + _("Remote provisioning URI successfully set. Please restart Linphone in order to load the new remote settings")); + g_signal_connect_swapped(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), dialog); + gtk_widget_show(dialog); +#endif + } + } else { + GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(w), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Invalid remote provisioning URI")); + g_signal_connect_swapped(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), dialog); + gtk_widget_show(dialog); } } diff --git a/gtk/config-uri.ui b/gtk/config-uri.ui index cc99c40db..26c1fef0e 100644 --- a/gtk/config-uri.ui +++ b/gtk/config-uri.ui @@ -19,11 +19,10 @@ end - gtk-undo + gtk-cancel True True True - False True @@ -39,7 +38,6 @@ True True True - False True @@ -77,7 +75,7 @@ Please enter or modify the configuration URI below. After clicking OK, Linphone True True • - https:// + https:// False False True diff --git a/gtk/main.c b/gtk/main.c index 9503b68a0..b690d8bdf 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -817,7 +817,7 @@ static void linphone_gtk_update_call_buttons(LinphoneCall *call){ conf_frame=(GtkWidget *)g_object_get_data(G_OBJECT(mw),"conf_frame"); if(conf_frame==NULL){ linphone_gtk_enable_transfer_button(lc,call_list_size>1); - linphone_gtk_enable_conference_button(lc,call_list_size>0); + linphone_gtk_enable_conference_button(lc,call_list_size>1); } else { linphone_gtk_enable_transfer_button(lc,FALSE); linphone_gtk_enable_conference_button(lc,FALSE); @@ -1939,6 +1939,7 @@ static void linphone_gtk_init_main_window(void){ G_CALLBACK (linphone_gtk_close), main_window); #ifdef HAVE_GTK_OSX { + gtk_widget_show(main_window); GtkWidget *menubar=linphone_gtk_get_widget(main_window,"menubar1"); GtkosxApplication *theMacApp = gtkosx_application_get(); gtkosx_application_set_menu_bar(theMacApp,GTK_MENU_SHELL(menubar)); diff --git a/gtk/parameters.ui b/gtk/parameters.ui index 511066899..bb90ccefe 100644 --- a/gtk/parameters.ui +++ b/gtk/parameters.ui @@ -53,7 +53,7 @@ 10 - 60000 + 30000 2000 100 500 diff --git a/gtk/propertybox.c b/gtk/propertybox.c index 67cd8127a..3fe2128be 100644 --- a/gtk/propertybox.c +++ b/gtk/propertybox.c @@ -1397,9 +1397,16 @@ static void linphone_gtk_show_media_encryption(GtkWidget *pb){ } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"media_encryption_mandatory_checkbox")), linphone_core_is_media_encryption_mandatory(lc)); - - gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(pb,"chat_lime_combo")), linphone_core_lime_enabled(lc)); - gtk_widget_set_sensitive(linphone_gtk_get_widget(pb,"chat_lime_combo"), linphone_core_lime_available(lc)); + + gtk_widget_set_visible (linphone_gtk_get_widget(pb,"chat_lime_label"), 0); + gtk_widget_set_visible (linphone_gtk_get_widget(pb,"chat_lime_combo"), 0); + + if (linphone_gtk_get_ui_config_int("lime_experimental_feature", 0)){ + gtk_widget_set_visible (linphone_gtk_get_widget(pb,"chat_lime_label"), 1); + gtk_widget_set_visible (linphone_gtk_get_widget(pb,"chat_lime_combo"), 1); + gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(pb,"chat_lime_combo")), linphone_core_lime_enabled(lc)); + gtk_widget_set_sensitive(linphone_gtk_get_widget(pb,"chat_lime_combo"), linphone_core_lime_available(lc)); + } g_object_unref(G_OBJECT(model)); } diff --git a/gtk/videowindow.c b/gtk/videowindow.c index 64f120c48..11a90839a 100644 --- a/gtk/videowindow.c +++ b/gtk/videowindow.c @@ -196,14 +196,17 @@ static void on_controls_response(GtkWidget *dialog, int response_id, GtkWidget * } -static void on_controls_destroy(GtkWidget *w){ +static gboolean on_controls_destroy(GtkWidget *w){ GtkWidget *video_window=(GtkWidget*)g_object_get_data(G_OBJECT(w),"video_window"); gint timeout=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w),"timeout")); if (timeout!=0){ g_source_remove(timeout); g_object_set_data(G_OBJECT(w),"timeout",GINT_TO_POINTER(0)); } - g_object_set_data(G_OBJECT(video_window),"controls",NULL); + if (video_window) { + g_object_set_data(G_OBJECT(video_window),"controls",NULL); + } + return FALSE; } static gboolean _set_video_controls_position(GtkWidget *video_window){ @@ -228,7 +231,8 @@ static void set_video_controls_position(GtkWidget *video_window){ } static gboolean video_window_moved(GtkWidget *widget, GdkEvent *event, gpointer user_data){ - set_video_controls_position(widget); + /*Workaround to Video window bug on Windows. */ + /* set_video_controls_position(widget); */ return FALSE; } diff --git a/java/common/org/linphone/core/LinphoneChatMessage.java b/java/common/org/linphone/core/LinphoneChatMessage.java index fab2bab28..972a39d1d 100644 --- a/java/common/org/linphone/core/LinphoneChatMessage.java +++ b/java/common/org/linphone/core/LinphoneChatMessage.java @@ -230,7 +230,7 @@ public interface LinphoneChatMessage { /** * Fulfill a chat message char by char. Message linked to a Real Time Text Call send char in realtime following RFC 4103/T.140 * To commit a message, use #linphone_chat_room_send_message - * @param[in] character T.140 char + * @param character T.140 char * @throw LinphoneCoreExeption . */ void putChar(long character) throws LinphoneCoreException; diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java index 13da7c21a..9f20ce4a9 100644 --- a/java/common/org/linphone/core/LinphoneCore.java +++ b/java/common/org/linphone/core/LinphoneCore.java @@ -1063,7 +1063,7 @@ public interface LinphoneCore { LinphoneFriendList[] getFriendLists(); /** - * @brief Set my presence status + * Set my presence status * @param minutes_away how long in away * @param alternative_contact sip uri used to redirect call in state LinphoneStatusMoved * @param status OnlineStatus @@ -1071,18 +1071,18 @@ public interface LinphoneCore { */ void setPresenceInfo(int minutes_away, String alternative_contact, OnlineStatus status); /** - * @brief Get my presence status + * Get my presence status * @return OnlineStatus * @deprecated Use getPresenceModel() instead */ OnlineStatus getPresenceInfo(); /** - * @brief Set my presence status + * Set my presence status * @param presence #LinphonePresenceModel */ void setPresenceModel(PresenceModel presence); /** - * @brief Get my presence status + * Get my presence status * @return A #PresenceModel object, or null if no presence model has been set. */ PresenceModel getPresenceModel(); @@ -1610,7 +1610,7 @@ public interface LinphoneCore { * which could result in an active call. * Eg: don't start a new call if one is in outgoing ringing. * Eg: don't merge to conference either as it could result - * in two active calls (conference and accepted call). + * in two active calls (conference and accepted call). * @return */ boolean soundResourcesLocked(); diff --git a/java/common/org/linphone/core/LinphoneFriend.java b/java/common/org/linphone/core/LinphoneFriend.java index e79c57404..6b5ac197c 100644 --- a/java/common/org/linphone/core/LinphoneFriend.java +++ b/java/common/org/linphone/core/LinphoneFriend.java @@ -109,18 +109,18 @@ public interface LinphoneFriend { */ boolean isPresenceReceived(); /** - * @brief Get the status of a friend + * Get the status of a friend * @return OnlineStatus * @deprecated Use getPresenceModel() instead */ OnlineStatus getStatus(); /** - * @brief Get the presence information of a friend + * Get the presence information of a friend * @return A #PresenceModel object, or null if the friend do not have presence information (in which case he is considered offline) */ PresenceModel getPresenceModel(); /** - * @brief Set the presence information of a friend + * Set the presence information of a friend * @param presenceModel A #PresenceModel object */ void setPresenceModel(PresenceModel presenceModel); diff --git a/java/common/org/linphone/core/PresenceActivity.java b/java/common/org/linphone/core/PresenceActivity.java index 17d28bbd9..6ae197c03 100644 --- a/java/common/org/linphone/core/PresenceActivity.java +++ b/java/common/org/linphone/core/PresenceActivity.java @@ -22,39 +22,39 @@ package org.linphone.core; public interface PresenceActivity { /** - * @brief Gets the string representation of a presence activity. + * Gets the string representation of a presence activity. * @return A String representing the given activity. */ String toString(); /** - * @brief Gets the activity type of a presence activity. + * Gets the activity type of a presence activity. * @return The #PresenceActivityType of the activity. */ PresenceActivityType getType(); /** - * @brief Sets the type of activity of a presence activity. - * @param[in] acttype The activity type to set for the activity. + * Sets the type of activity of a presence activity. + * @param acttype The activity type to set for the activity. * @return 0 if successful, a value < 0 in case of error. */ int setType(PresenceActivityType type); /** - * @brief Gets the description of a presence activity. + * Gets the description of a presence activity. * @return A String containing the description of the presence activity, or null if no description is specified. */ String getDescription(); /** - * @brief Sets the description of a presence activity. - * @param[in] description An additional description of the activity. Can be null if no additional description is to be added. + * Sets the description of a presence activity. + * @param description An additional description of the activity. Can be null if no additional description is to be added. * @return 0 if successful, a value < 0 in case of error. */ int setDescription(String description); /** - * @brief Gets the native pointer for this object. + * Gets the native pointer for this object. */ long getNativePtr(); diff --git a/java/common/org/linphone/core/PresenceModel.java b/java/common/org/linphone/core/PresenceModel.java index 03c372b9c..f725dc0c6 100644 --- a/java/common/org/linphone/core/PresenceModel.java +++ b/java/common/org/linphone/core/PresenceModel.java @@ -22,46 +22,46 @@ package org.linphone.core; public interface PresenceModel { /** - * @brief Gets the basic status of a presence model. + * Gets the basic status of a presence model. * @return The #BasicStatus of the #PresenceModel object. */ PresenceBasicStatus getBasicStatus(); /** - * @brief Sets the basic status of a presence model. - * @param[in] basic_status The #BasicStatus to set for the #PresenceModel object. + * Sets the basic status of a presence model. + * @param basic_status The #BasicStatus to set for the #PresenceModel object. * @return 0 if successful, a value < 0 in case of error. */ int setBasicStatus(PresenceBasicStatus basic_status); /** - * @brief Gets the timestamp of a presence model. + * Gets the timestamp of a presence model. * @return The timestamp of the #LinphonePresenceModel object or -1 on error. */ long getTimestamp(); /** - * @brief Gets the contact of a presence model. + * Gets the contact of a presence model. * @return A string containing the contact, or null if no contact is found. */ String getContact(); /** - * @brief Sets the contact of a presence model. + * Sets the contact of a presence model. * @param contact The contact string to set. */ void setContact(String contact); /** - * @brief Gets the first activity of a presence model (there is usually only one). + * Gets the first activity of a presence model (there is usually only one). * @return A #PresenceActivity object if successful, null otherwise. */ PresenceActivity getActivity(); /** - * @brief Sets the activity of a presence model (limits to only one activity). - * @param[in] activity The #PresenceActivityType to set for the model. - * @param[in] description An additional description of the activity to set for the model. Can be null if no additional description is to be added. + * Sets the activity of a presence model (limits to only one activity). + * @param activity The #PresenceActivityType to set for the model. + * @param description An additional description of the activity to set for the model. Can be null if no additional description is to be added. * @return 0 if successful, a value < 0 in case of error. * * WARNING: This method will modify the basic status of the model according to the activity being set. @@ -70,42 +70,42 @@ public interface PresenceModel { int setActivity(PresenceActivityType activity, String description); /** - * @brief Gets the number of activities included in the presence model. + * Gets the number of activities included in the presence model. * @return The number of activities included in the #PresenceModel object. */ long getNbActivities(); /** - * @brief Gets the nth activity of a presence model. + * Gets the nth activity of a presence model. * @param idx The index of the activity to get (the first activity having the index 0). * @return A #PresenceActivity object if successful, null otherwise. */ PresenceActivity getNthActivity(long idx); /** - * @brief Adds an activity to a presence model. - * @param[in] activity The #PresenceActivity to add to the model. + * Adds an activity to a presence model. + * @param activity The #PresenceActivity to add to the model. * @return 0 if successful, a value < 0 in case of error. */ int addActivity(PresenceActivity activity); /** - * @brief Clears the activities of a presence model. + * Clears the activities of a presence model. * @return 0 if successful, a value < 0 in case of error. */ int clearActivities(); /** - * @brief Gets the first note of a presence model (there is usually only one). - * @param[in] lang The language of the note to get. Can be null to get a note that has no language specified or to get the first note whatever language it is written into. + * Gets the first note of a presence model (there is usually only one). + * @param lang The language of the note to get. Can be null to get a note that has no language specified or to get the first note whatever language it is written into. * @return A #PresenceNote object if successful, null otherwise. */ PresenceNote getNote(String lang); /** - * @brief Adds a note to a presence model. - * @param[in] note_content The note to be added to the presence model. - * @param[in] lang The language of the note to be added. Can be null if no language is to be specified for the note. + * Adds a note to a presence model. + * @param note_content The note to be added to the presence model. + * @param lang The language of the note to be added. Can be null if no language is to be specified for the note. * @return 0 if successful, a value < 0 in case of error. * * Only one note for each language can be set, so e.g. setting a note for the 'fr' language if there is only one will replace the existing one. @@ -113,59 +113,59 @@ public interface PresenceModel { int addNote(String note_content, String lang); /** - * @brief Clears all the notes of a presence model. + * Clears all the notes of a presence model. * @return 0 if successful, a value < 0 in case of error. */ int clearNotes(); /** - * @brief Gets the number of services included in the presence model. + * Gets the number of services included in the presence model. * @return The number of services included in the #PresenceModel object. */ long getNbServices(); /** - * @brief Gets the nth service of a presence model. - * @param[in] idx The index of the service to get (the first service having the index 0). + * Gets the nth service of a presence model. + * @param idx The index of the service to get (the first service having the index 0). * @return A #PresenceService object if successful, null otherwise. */ PresenceService getNthService(long idx); /** - * @brief Adds a service to a presence model. - * @param[in] service The #PresenceService object to add to the model. + * Adds a service to a presence model. + * @param service The #PresenceService object to add to the model. * @return 0 if successful, a value < 0 in case of error. */ int addService(PresenceService service); /** - * @brief Clears the services of a presence model. + * Clears the services of a presence model. * @return 0 if successful, a value < 0 in case of error. */ int clearServices(); /** - * @brief Gets the number of persons included in the presence model. + * Gets the number of persons included in the presence model. * @return The number of persons included in the #PresenceModel object. */ long getNbPersons(); /** - * @brief Gets the nth person of a presence model. - * @param[in] idx The index of the person to get (the first person having the index 0). + * Gets the nth person of a presence model. + * @param idx The index of the person to get (the first person having the index 0). * @return A pointer to a #PresencePerson object if successful, null otherwise. */ PresencePerson getNthPerson(long idx); /** - * @brief Adds a person to a presence model. - * @param[in] person The #PresencePerson object to add to the model. + * Adds a person to a presence model. + * @param person The #PresencePerson object to add to the model. * @return 0 if successful, a value < 0 in case of error. */ int addPerson(PresencePerson person); /** - * @brief Clears the persons of a presence model. + * Clears the persons of a presence model. * @return 0 if successful, a value < 0 in case of error. */ int clearPersons(); diff --git a/java/common/org/linphone/core/PresenceNote.java b/java/common/org/linphone/core/PresenceNote.java index 8d9bd55fe..fba047a58 100644 --- a/java/common/org/linphone/core/PresenceNote.java +++ b/java/common/org/linphone/core/PresenceNote.java @@ -22,33 +22,33 @@ package org.linphone.core; public interface PresenceNote { /** - * @brief Gets the content of a presence note. + * Gets the content of a presence note. * @return A String with the content of the presence note. */ String getContent(); /** - * @brief Sets the content of a presence note. - * @param[in] content The content of the note. + * Sets the content of a presence note. + * @param content The content of the note. * @return 0 if successful, a value < 0 in case of error. */ int setContent(String content); /** - * @brief Gets the language of a presence note. + * Gets the language of a presence note. * @return A String containing the language of the presence note, or null if no language is specified. */ String getLang(); /** - * @brief Sets the language of a presence note. - * @param[in] lang The language of the note. + * Sets the language of a presence note. + * @param lang The language of the note. * @return 0 if successful, a value < 0 in case of error. */ int setLang(String lang); /** - * @brief Gets the native pointer for this object. + * Gets the native pointer for this object. */ long getNativePtr(); diff --git a/java/common/org/linphone/core/PresencePerson.java b/java/common/org/linphone/core/PresencePerson.java index 3db93e26c..be6449fa6 100644 --- a/java/common/org/linphone/core/PresencePerson.java +++ b/java/common/org/linphone/core/PresencePerson.java @@ -22,98 +22,98 @@ package org.linphone.core; public interface PresencePerson { /** - * @brief Gets the id of a presence person. + * Gets the id of a presence person. * @return A string containing the id. */ String getId(); /** - * @brief Sets the id of a presence person. - * @param[in] id The id string to set. Can be null to generate it automatically. + * Sets the id of a presence person. + * @param id The id string to set. Can be null to generate it automatically. * @return 0 if successful, a value < 0 in case of error. */ int setId(String id); /** - * @brief Gets the number of activities included in the presence person. + * Gets the number of activities included in the presence person. * @return The number of activities included in the #PresencePerson object. */ long getNbActivities(); /** - * @brief Gets the nth activity of a presence person. - * @param[in] idx The index of the activity to get (the first activity having the index 0). + * Gets the nth activity of a presence person. + * @param idx The index of the activity to get (the first activity having the index 0). * @return A #PresenceActivity object if successful, null otherwise. */ PresenceActivity getNthActivity(long idx); /** - * @brief Adds an activity to a presence person. - * @param[in] activity The #PresenceActivity object to add to the person. + * Adds an activity to a presence person. + * @param activity The #PresenceActivity object to add to the person. * @return 0 if successful, a value < 0 in case of error. */ int addActivity(PresenceActivity activity); /** - * @brief Clears the activities of a presence person. + * Clears the activities of a presence person. * @return 0 if successful, a value < 0 in case of error. */ int clearActivities(); /** - * @brief Gets the number of notes included in the presence person. + * Gets the number of notes included in the presence person. * @return The number of notes included in the #PresencePerson object. */ long getNbNotes(); /** - * @brief Gets the nth note of a presence person. - * @param[in] idx The index of the note to get (the first note having the index 0). + * Gets the nth note of a presence person. + * @param idx The index of the note to get (the first note having the index 0). * @return A pointer to a #PresenceNote object if successful, null otherwise. */ PresenceNote getNthNote(long idx); /** - * @brief Adds a note to a presence person. - * @param[in] note The #PresenceNote object to add to the person. + * Adds a note to a presence person. + * @param note The #PresenceNote object to add to the person. * @return 0 if successful, a value < 0 in case of error. */ int addNote(PresenceNote note); /** - * @brief Clears the notes of a presence person. + * Clears the notes of a presence person. * @return 0 if successful, a value < 0 in case of error. */ int clearNotes(); /** - * @brief Gets the number of activities notes included in the presence person. + * Gets the number of activities notes included in the presence person. * @return The number of activities notes included in the #PresencePerson object. */ long getNbActivitiesNotes(); /** - * @brief Gets the nth activities note of a presence person. - * @param[in] idx The index of the activities note to get (the first note having the index 0). + * Gets the nth activities note of a presence person. + * @param idx The index of the activities note to get (the first note having the index 0). * @return A pointer to a #PresenceNote object if successful, null otherwise. */ PresenceNote getNthActivitiesNote(long idx); /** - * @brief Adds an activities note to a presence person. - * @param[in] note The #PresenceNote object to add to the person. + * Adds an activities note to a presence person. + * @param note The #PresenceNote object to add to the person. * @return 0 if successful, a value < 0 in case of error. */ int addActivitiesNote(PresenceNote note); /** - * @brief Clears the activities notes of a presence person. + * Clears the activities notes of a presence person. * @return 0 if successful, a value < 0 in case of error. */ int clearActivitesNotes(); /** - * @brief Gets the native pointer for this object. + * Gets the native pointer for this object. */ long getNativePtr(); diff --git a/java/common/org/linphone/core/PresenceService.java b/java/common/org/linphone/core/PresenceService.java index 6ffcdcd4e..f36bf11da 100644 --- a/java/common/org/linphone/core/PresenceService.java +++ b/java/common/org/linphone/core/PresenceService.java @@ -22,72 +22,72 @@ package org.linphone.core; public interface PresenceService { /** - * @brief Gets the id of a presence service. + * Gets the id of a presence service. * @return A string containing the id. */ String getId(); /** - * @brief Sets the id of a presence service. - * @param[in] id The id string to set. Can be null to generate it automatically. + * Sets the id of a presence service. + * @param id The id string to set. Can be null to generate it automatically. * @return 0 if successful, a value < 0 in case of error. */ int setId(String id); /** - * @brief Gets the basic status of a presence service. + * Gets the basic status of a presence service. * @return The #PresenceBasicStatus of the #PresenceService object. */ PresenceBasicStatus getBasicStatus(); /** - * @brief Sets the basic status of a presence service. - * @param[in] status The #PresenceBasicStatus to set for the #PresenceService object. + * Sets the basic status of a presence service. + * @param status The #PresenceBasicStatus to set for the #PresenceService object. * @return 0 if successful, a value < 0 in case of error. */ int setBasicStatus(PresenceBasicStatus status); /** - * @brief Gets the contact of a presence service. + * Gets the contact of a presence service. * @return A string containing the contact, or null if no contact is found. */ String getContact(); /** - * @brief Sets the contact of a presence service. - * @param[in] contact The contact string to set. + * Sets the contact of a presence service. + * @param contact The contact string to set. * @return 0 if successful, a value < 0 in case of error. */ int setContact(String contact); /** - * @brief Gets the number of notes included in the presence service. + * Gets the number of notes included in the presence service. * @return The number of notes included in the #PresenceService object. */ long getNbNotes(); /** - * @brief Gets the nth note of a presence service. - * @param[in] idx The index of the note to get (the first note having the index 0). + * Gets the nth note of a presence service. + * @param idx The index of the note to get (the first note having the index 0). * @return A pointer to a #PresenceNote object if successful, null otherwise. */ PresenceNote getNthNote(long idx); /** - * @brief Adds a note to a presence service. - * @param[in] note The #PresenceNote object to add to the service. + * Adds a note to a presence service. + * @param note The #PresenceNote object to add to the service. * @return 0 if successful, a value < 0 in case of error. */ int addNote(PresenceNote note); /** - * @brief Clears the notes of a presence service. + * Clears the notes of a presence service. * @return 0 if successful, a value < 0 in case of error. */ int clearNotes(); /** - * @brief Gets the native pointer for this object. + * Gets the native pointer for this object. */ long getNativePtr(); diff --git a/tools/python/doc/source/conf.py b/tools/python/doc/source/conf.py index f3ecde103..eb9ba43bb 100644 --- a/tools/python/doc/source/conf.py +++ b/tools/python/doc/source/conf.py @@ -53,9 +53,9 @@ copyright = u'2014, Belledonne Communications' # built documents. # # The short X.Y version. -version = '3.9' +version = '3.10' # The full version, including alpha/beta/rc tags. -release = '3.9.1' +release = '3.10.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.