fix some bugs

diff --git a/console/linphonec.c b/console/linphonec.c
index 7fcc0aa4993cdb9f1a7e1ebdea76265e402a8eae..6985287d67871794a5d8ed65ab7f230cc8f848e4 100644 (file)
--- a/console/linphonec.c
+++ b/console/linphonec.c
@@ -853,16 +853,16 @@ usage: linphonec [-c file] [-s sipaddr] [-a] [-V] [-d level ] [-l logfile]\n\
 #ifdef HAVE_X11_XLIB_H
 static void sdl_x11_apply_video_params(){
        static SDL_SysWMinfo info;
-       static bool_t wminfo_ready=FALSE;
+       bool_t wminfo_ready=FALSE;
        
-       if ( !wminfo_ready){
-               SDL_VERSION(&info.version);
-               if ( SDL_GetWMInfo(&info) ) {
-                       if ( info.subsystem == SDL_SYSWM_X11 ) {
-                               wminfo_ready=TRUE;
-                       }
+       
+       SDL_VERSION(&info.version);
+       if ( SDL_GetWMInfo(&info) ) {
+               if ( info.subsystem == SDL_SYSWM_X11 ) {
+                       wminfo_ready=TRUE;
                }
        }
+       
        if ( !wminfo_ready) return;
        
        {
@@ -895,15 +895,17 @@ static void sdl_x11_apply_video_params(){
 
 
 static void lpc_apply_video_params(){
-       if (lpc_video_params.refresh){
-               unsigned long wid=linphone_core_get_native_video_window_id (linphonec);
-               if (wid!=0){
-                       lpc_video_params.refresh=FALSE;
+       static unsigned long prev_wid=0;
+
+       unsigned long wid=linphone_core_get_native_video_window_id (linphonec);
+
+       if (wid!=0 && (lpc_video_params.refresh || prev_wid!=wid)){
+               lpc_video_params.refresh=FALSE;
 #ifdef HAVE_X11_XLIB_H
-                       sdl_x11_apply_video_params();
+               sdl_x11_apply_video_params();
 #endif
-               }
        }
+       prev_wid=wid;
 }
 
 #endif

diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index 25c79e5828f059a45d10f39ed38918e219b86595..749bfce6b6fea9497e95a891df8aef413990a9b0 100644 (file)
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -1124,8 +1124,18 @@ static void process_media_control_xml(Sal *sal, eXosip_event_t *ev){
                        eXosip_call_build_answer(ev->tid,200,&ans);
                        if (ans)
                                eXosip_call_send_answer(ev->tid,200,ans);
+                       return;
                }
        }
+       /*in all other cases we must say it is not implemented.*/
+       {
+               osip_message_t *ans=NULL;
+               eXosip_lock();
+               eXosip_call_build_answer(ev->tid,501,&ans);
+               if (ans)
+                       eXosip_call_send_answer(ev->tid,501,ans);
+               eXosip_unlock();
+       }
 }
 
 static void process_dtmf_relay(Sal *sal, eXosip_event_t *ev){

diff --git a/coreapi/sal_eXosip2_sdp.c b/coreapi/sal_eXosip2_sdp.c
index 7d63148afcec58aa2c50c84eccb96852ca5a34a4..a9f098ed24b99f9d3ad94aa5351d6dc727e99775 100644 (file)
--- a/coreapi/sal_eXosip2_sdp.c
+++ b/coreapi/sal_eXosip2_sdp.c
@@ -323,13 +323,14 @@ int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){
                        payload_type_set_number(pt,ptn);
                        /* get the rtpmap associated to this codec, if any */
                        rtpmap=sdp_message_a_attr_value_get_with_pt(msg, i,ptn,"rtpmap");
-                       payload_type_fill_from_rtpmap(pt,rtpmap);
-                       /* get the fmtp, if any */
-                       fmtp=sdp_message_a_attr_value_get_with_pt(msg, i, ptn,"fmtp");
-                       payload_type_set_send_fmtp(pt,fmtp);
-                       stream->payloads=ms_list_append(stream->payloads,pt);
-                       ms_message("Found payload %s/%i fmtp=%s",pt->mime_type,pt->clock_rate,
-                           pt->send_fmtp ? pt->send_fmtp : "");
+                       if (payload_type_fill_from_rtpmap(pt,rtpmap)==0){
+                               /* get the fmtp, if any */
+                               fmtp=sdp_message_a_attr_value_get_with_pt(msg, i, ptn,"fmtp");
+                               payload_type_set_send_fmtp(pt,fmtp);
+                               stream->payloads=ms_list_append(stream->payloads,pt);
+                               ms_message("Found payload %s/%i fmtp=%s",pt->mime_type,pt->clock_rate,
+                                       pt->send_fmtp ? pt->send_fmtp : "");
+                       }
                }
        }
        desc->nstreams=i;

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1e699aa8a882bb200bc60d08ba4f0f283c4b020b..704f4138649ddca56c963078b47245ed80f2ae73 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,7 +20,6 @@ gtk/call_logs.ui
 gtk/main.ui
 gtk/sip_account.ui
 gtk/chatroom.ui
-gtk/incoming_call.ui
 gtk/parameters.ui
 gtk/buddylookup.ui
 gtk/waiting.ui