fix proxy removal in linphonec

diff --git a/console/commands.c b/console/commands.c
index 77d9983c8a4472ecdd55e4311aeab2be84a909aa..658f0fe2436e59c3865756cc0805b73d889ad7fc 100644 (file)
--- a/console/commands.c
+++ b/console/commands.c
@@ -89,8 +89,10 @@ static int lpc_cmd_resume(LinphoneCore *lc, char *args);
 static int lpc_cmd_mute_mic(LinphoneCore *lc, char *args);
 static int lpc_cmd_unmute_mic(LinphoneCore *lc, char *args);
 static int lpc_cmd_rtp_no_xmit_on_audio_mute(LinphoneCore *lc, char *args);
+#ifdef VIDEO_ENABLED
 static int lpc_cmd_camera(LinphoneCore *lc, char *args);
 static int lpc_cmd_video_window(LinphoneCore *lc, char *args);
+#endif
 static int lpc_cmd_states(LinphoneCore *lc, char *args);
 static int lpc_cmd_identify(LinphoneCore *lc, char *args);
 
@@ -265,12 +267,14 @@ static LPC_COMMAND advanced_commands[] = {
                  "Set the rtp_no_xmit_on_audio_mute configuration parameter",
                  "   If set to 1 then rtp transmission will be muted when\n"
                  "   audio is muted , otherwise rtp is always sent."}, 
+#ifdef VIDEO_ENABLED
        { "vwindow", lpc_cmd_video_window, "Control video display window",
                "'vwindow show': shows video window\n"
                "'vwindow hide': hides video window\n"
                "'vwindow pos <x> <y>': Moves video window to x,y pixel coordinates\n"
                "'vwindow size <width> <height>': Resizes video window"
        },
+#endif
        { "states", lpc_cmd_states, "Show internal states of liblinphone, registrations and calls, according to linphonecore.h definitions",
                "'states global': shows global state of liblinphone \n"
                "'states calls': shows state of calls\n"
@@ -1658,7 +1662,6 @@ linphonec_proxy_remove(LinphoneCore *lc, int index)
        }
        linphone_core_remove_proxy_config(lc,cfg);
        linphonec_out("Proxy %s removed.\n", cfg->reg_proxy);
-       linphone_proxy_config_destroy(cfg);
 }
 
 static int
@@ -2188,8 +2191,8 @@ static int lpc_cmd_rtp_no_xmit_on_audio_mute(LinphoneCore *lc, char *args)
        return 1;
 }
 
-static int lpc_cmd_video_window(LinphoneCore *lc, char *args){
 #ifdef VIDEO_ENABLED
+static int lpc_cmd_video_window(LinphoneCore *lc, char *args){
        char subcommand[64];
        int a,b;
        int err;
@@ -2213,11 +2216,10 @@ static int lpc_cmd_video_window(LinphoneCore *lc, char *args){
                        lpc_video_params.refresh=TRUE;
                }else return 0;
        }
-#else
-       linphonec_out("Sorry, this version of linphonec wasn't compiled with video support.");
-#endif
+
        return 1;
 }
+#endif
 
 static void lpc_display_global_state(LinphoneCore *lc){
        linphonec_out("Global liblinphone state\n%s\n",
@@ -2283,6 +2285,7 @@ static int lpc_cmd_states(LinphoneCore *lc, char *args){
        return 0;
 }
 
+#ifdef VIDEO_ENABLED
 static int lpc_cmd_camera(LinphoneCore *lc, char *args){
        LinphoneCall *call=linphone_core_get_current_call(lc);
        bool_t activated=FALSE;
@@ -2330,6 +2333,8 @@ static int lpc_cmd_camera(LinphoneCore *lc, char *args){
        return 1;
 }
 
+#endif
+
 static int lpc_cmd_identify(LinphoneCore *lc, char *args){
        LinphoneCall *call;
        const char *remote_ua;

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 2b71e664d2441165642c3772c7dd5cf5abedd279..cee14639137361a8bf2c142a668db390d8dd5475 100644 (file)
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -32,9 +32,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "mediastreamer2/msequalizer.h"
 #include "mediastreamer2/msfileplayer.h"
 
+#ifdef VIDEO_ENABLED
 static MSWebCam *get_nowebcam_device(){
        return ms_web_cam_manager_get_cam(ms_web_cam_manager_get(),"StaticImage: Static picture");
 }
+#endif
 
 
 static MSList *make_codec_list(LinphoneCore *lc, const MSList *codecs, bool_t only_one_codec){
@@ -804,6 +806,8 @@ static void _linphone_call_start_media_streams(LinphoneCall *call, bool_t send_e
                                VideoStreamDir dir=VideoStreamSendRecv;
                                MSWebCam *cam=lc->video_conf.device;
                                bool_t is_inactive=FALSE;
+
+                               call->params.has_video=TRUE;
                                
                                video_stream_set_sent_video_size(call->videostream,linphone_core_get_preferred_video_size(lc));
                                video_stream_enable_self_view(call->videostream,lc->video_conf.selfview);