From bbff2ea0ac77f1623f83eb3b27c113cfdc5cd97c Mon Sep 17 00:00:00 2001 From: smorlat Date: Wed, 11 Mar 2009 20:37:28 +0000 Subject: [PATCH] fix bug when using proxies git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@336 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/console/linphonec.dev | 2 +- linphone/coreapi/plugins/buddylookup/src/lookup.c | 4 ++-- linphone/gtk-glade/linphone.iss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linphone/console/linphonec.dev b/linphone/console/linphonec.dev index a62521da8..cf0619ef2 100755 --- a/linphone/console/linphonec.dev +++ b/linphone/console/linphonec.dev @@ -57,7 +57,7 @@ Includes=../oRTP/include;../mediastreamer2/include;../../linphone-deps/include;. Libs=../oRTP/build/win32native;../mediastreamer2/build/win32native;../coreapi/;../../linphone-deps/lib ResourceIncludes= MakeIncludes= -Compiler=-g -02_@@_ +Compiler=-g -02_@@_-DIN_LINPHONE_@@_-D_WIN32_WINNT=0x0501 _@@_ CppCompiler= Linker=-mwindows_@@_-Wl,--export-all-symbols_@@_-Wl,--add-stdcall-alias_@@_-llinphone_@@_-lmediastreamer2_@@_-lortp_@@_-losip2_@@_-losipparser2_@@_-leXosip2_@@_-lws2_32_@@_ PreprocDefines= diff --git a/linphone/coreapi/plugins/buddylookup/src/lookup.c b/linphone/coreapi/plugins/buddylookup/src/lookup.c index 197ae2b0f..01a905511 100644 --- a/linphone/coreapi/plugins/buddylookup/src/lookup.c +++ b/linphone/coreapi/plugins/buddylookup/src/lookup.c @@ -24,6 +24,7 @@ typedef struct _BuddyLookupState{ void set_proxy(SoupSession *session, const char *proxy){ SoupURI *uri=soup_uri_new(proxy); + ms_message("Using http proxy %s",proxy); g_object_set(G_OBJECT(session),"proxy-uri",uri,NULL); } @@ -32,7 +33,7 @@ static void buddy_lookup_instance_init(SipSetupContext *ctx){ const char *proxy=NULL; s->session=soup_session_sync_new(); proxy=getenv("http_proxy"); - set_proxy(s->session,proxy); + if (proxy && strlen(proxy)>0) set_proxy(s->session,proxy); ctx->data=s; } @@ -159,7 +160,6 @@ static void * process_xml_rpc_request(void *up){ xml_rpc_parse_response(ctx,sm); }else{ ms_error("request failed, error-code=%i (%s)",code,soup_status_get_phrase(code)); - *((int*)NULL)=3; s->status=BuddyLookupFailure; } s->processing=FALSE; diff --git a/linphone/gtk-glade/linphone.iss b/linphone/gtk-glade/linphone.iss index 11898c8e1..89be5090f 100755 --- a/linphone/gtk-glade/linphone.iss +++ b/linphone/gtk-glade/linphone.iss @@ -3,7 +3,7 @@ [Setup] AppName=Linphone -AppVerName=Linphone for windows 3.0.0 (gtk/glade interface based on liblinphone) +AppVerName=Linphone version 3.0.0 AppPublisher=linphone.org AppPublisherURL=http://www.linphone.org AppSupportURL=http://www.linphone.org