update ms2

This commit is contained in:
Simon Morlat 2013-09-13 16:48:50 +02:00
parent c413a81e39
commit bbedbf7652
4 changed files with 21 additions and 1 deletions

View file

@ -159,6 +159,14 @@ LinphoneFriend *linphone_friend_new_with_addr(const char *addr){
return fr;
}
void linphone_friend_set_user_data(LinphoneFriend *lf, void *data){
lf->up=data;
}
void* linphone_friend_get_user_data(const LinphoneFriend *lf){
return lf->up;
}
bool_t linphone_friend_in_list(const LinphoneFriend *lf){
return lf->lc!=NULL;
}

View file

@ -228,6 +228,17 @@ LINPHONE_PUBLIC LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFr
*/
LINPHONE_PUBLIC const LinphonePresenceModel * linphone_friend_get_presence_model(LinphoneFriend *lf);
/**
* Store user pointer to friend object.
**/
LINPHONE_PUBLIC void linphone_friend_set_user_data(LinphoneFriend *lf, void *data);
/**
* Retrieve user data associated with friend.
**/
LINPHONE_PUBLIC void* linphone_friend_get_user_data(const LinphoneFriend *lf);
LINPHONE_PUBLIC BuddyInfo * linphone_friend_get_info(const LinphoneFriend *lf);
LINPHONE_PUBLIC void linphone_friend_set_ref_key(LinphoneFriend *lf, const char *key);
LINPHONE_PUBLIC const char *linphone_friend_get_ref_key(const LinphoneFriend *lf);

View file

@ -439,6 +439,7 @@ struct _LinphoneFriend{
struct _LinphoneCore *lc;
BuddyInfo *info;
char *refkey;
void *up;
bool_t subscribe;
bool_t subscribe_active;
bool_t inc_subscribe_pending;

@ -1 +1 @@
Subproject commit 7c4bfcb0baf9ebc0e6edd94fc46b7a512fb733bf
Subproject commit 612d8ec2c4997f457c1f2142618e2b87b5d46f44