Merge branch 'master' of git.linphone.org:linphone

This commit is contained in:
Yann Diorcet 2012-08-06 14:14:57 +02:00
commit 54ec1064fd

View file

@ -720,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;
/**