diff --git a/NEWS b/NEWS index 903df2fb2..2f74239aa 100644 --- a/NEWS +++ b/NEWS @@ -5,8 +5,9 @@ linphone-3.4.0 -- XXXXX - acceptance of 2nd call while putting the others on hold - creation of another outgoing call while already in call - blind call transfer - - attend call transfer + - attended call transfer * improve bandwidth management (one b=AS line is used for audio+video) + * improvements in the echo limiter * stun support bugfixes * possibility to use two video windows, one for local preview, one for remote video (linphonec only) * optimize by not re-creating streams when SDP is unchanged during a reinvite diff --git a/coreapi/sal.c b/coreapi/sal.c index 4e09846f6..6f80436c6 100644 --- a/coreapi/sal.c +++ b/coreapi/sal.c @@ -267,9 +267,11 @@ void __sal_op_free(SalOp *op){ sal_media_description_unref(b->remote_media); ms_free(op); } + SalAuthInfo* sal_auth_info_new() { return ms_new0(SalAuthInfo,1); } + SalAuthInfo* sal_auth_info_clone(const SalAuthInfo* auth_info) { SalAuthInfo* new_auth_info=sal_auth_info_new(); new_auth_info->username=auth_info->username?ms_strdup(auth_info->username):NULL; @@ -278,6 +280,7 @@ SalAuthInfo* sal_auth_info_clone(const SalAuthInfo* auth_info) { new_auth_info->password=auth_info->password?ms_strdup(auth_info->password):NULL; return new_auth_info; } + void sal_auth_info_delete(const SalAuthInfo* auth_info) { if (auth_info->username) ms_free(auth_info->username); if (auth_info->userid) ms_free(auth_info->userid); diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 6cadde1ce..480aafbd7 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -747,7 +747,7 @@ static void push_auth_to_exosip(const SalAuthInfo *info){ eXosip_add_authentication_info (info->username,userid, info->password, NULL,info->realm); } -/** +/* * Just for symmetry ;-) */ static void pop_auth_from_exosip() { diff --git a/gtk/incall_view.c b/gtk/incall_view.c index 6cf5d58bd..3941bfe72 100644 --- a/gtk/incall_view.c +++ b/gtk/incall_view.c @@ -83,7 +83,7 @@ static void transfer_button_clicked(GtkWidget *button, gpointer call_ref){ GtkWidget *call_view=(GtkWidget*)linphone_call_get_user_pointer(other_call); if (other_call!=call){ int call_index=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(call_view),"call_index")); - char *remote_uri=linphone_call_get_remote_address_as_string (call); + char *remote_uri=linphone_call_get_remote_address_as_string (other_call); char *text=g_strdup_printf("Transfer to call #%i with %s",call_index,remote_uri); menu_item=gtk_image_menu_item_new_with_label(text); ms_free(remote_uri);