Merge branch 'master' into dev_ice

[linphone] / coreapi / linphonecore.h

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 10f6108c9ba3102c108199700454312b3988839f..87686d6ffd9e9e417b22abfcc2ce9311e8776782 100644 (file)
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -474,6 +474,8 @@ const char *linphone_proxy_config_get_addr(const LinphoneProxyConfig *obj);
 int linphone_proxy_config_get_expires(const LinphoneProxyConfig *obj);
 bool_t linphone_proxy_config_register_enabled(const LinphoneProxyConfig *obj);
 void linphone_proxy_config_refresh_register(LinphoneProxyConfig *obj);
+const char *linphone_proxy_config_get_contact_parameters(const LinphoneProxyConfig *obj);
+void linphone_proxy_config_set_contact_parameters(LinphoneProxyConfig *obj, const char *contact_params);
 struct _LinphoneCore * linphone_proxy_config_get_core(const LinphoneProxyConfig *obj);
 
 bool_t linphone_proxy_config_get_dial_escape_plus(const LinphoneProxyConfig *cfg);
@@ -718,11 +720,11 @@ typedef struct _LinphoneVTable{
        BuddyInfoUpdated buddy_info_updated; /**< a LinphoneFriend's BuddyInfo has changed*/
        NotifyReceivedCb notify_recv; /**< Other notifications*/
        CallStatsUpdated call_stats_updated; /**<Notifies on refreshing of call's statistics. */
-       DisplayStatusCb display_status; /**< Callback that notifies various events with human readable text.*/
-       DisplayMessageCb display_message;/**< Callback to display a message to the user */
-       DisplayMessageCb display_warning;/** Callback to display a warning to the user */
-       DisplayUrlCb display_url;
-       ShowInterfaceCb show; /**< Notifies the application that it should show up*/
+       DisplayStatusCb display_status; /**< DEPRECATED Callback that notifies various events with human readable text.*/
+       DisplayMessageCb display_message;/**< DEPRECATED Callback to display a message to the user */
+       DisplayMessageCb display_warning;/**< DEPRECATED Callback to display a warning to the user */
+       DisplayUrlCb display_url; /**< DEPRECATED */
+       ShowInterfaceCb show; /**< DEPRECATED Notifies the application that it should show up*/
 } LinphoneCoreVTable;
 
 /**