diff --git a/linphone/coreapi/plugins/buddylookup/libbuddylookup.dev b/linphone/coreapi/plugins/buddylookup/libbuddylookup.dev index 2c2861d68..ba06626e0 100755 --- a/linphone/coreapi/plugins/buddylookup/libbuddylookup.dev +++ b/linphone/coreapi/plugins/buddylookup/libbuddylookup.dev @@ -43,11 +43,11 @@ AutoIncBuildNrOnCompile=0 ProfileName=MingW 3.4.2 Type=3 ObjFiles= -Includes=../../../coreapi;../../../mediastreamer2/include;../../../oRTP/include;../../../../linphone-deps/include;../../../../gtk+-2.14.7/include/glib-2.0;../../../../libsoup-2.4.1/include/libsoup-2.4;../../../../gtk+-2.14.7/lib/glib-2.0/include -Libs=../../../../gtk+-2.14.7/lib;../../../../libsoup-2.4.1/lib;../../../../linphone-deps/lib;../../../oRTP/build/win32native;../../../mediastreamer2/build/win32native;../../../coreapi +Includes=../../../coreapi;../../../mediastreamer2/include;../../../oRTP/include;../../../../linphone-deps/include;../../../../gtk+-2.14.7/include/glib-2.0;../../../../libsoup/include/libsoup-2.4;../../../../gtk+-2.14.7/lib/glib-2.0/include +Libs=../../../../gtk+-2.14.7/lib;../../../../libsoup/lib;../../../../linphone-deps/lib;../../../oRTP/build/win32native;../../../mediastreamer2/build/win32native;../../../coreapi ResourceIncludes= MakeIncludes= -Compiler=-DBUILDING_DLL=1_@@_-DIN_LINPHONE_@@_ +Compiler=-DBUILDING_DLL=1_@@_-DIN_LINPHONE_@@_-02 -g_@@_ CppCompiler=-DBUILDING_DLL=1_@@_ Linker=--no-export-all-symbols_@@_--add-stdcall-alias_@@_-lsoup-2.4_@@_-lglib-2.0_@@_-lgio-2.0_@@_-lgobject-2.0_@@_-lxml2_@@_-llinphone_@@_-lmediastreamer2_@@_-lortp_@@_-losipparser2_@@_-lws2_32_@@_ PreprocDefines= diff --git a/linphone/coreapi/plugins/buddylookup/src/lookup.c b/linphone/coreapi/plugins/buddylookup/src/lookup.c index cd910f760..15826053f 100644 --- a/linphone/coreapi/plugins/buddylookup/src/lookup.c +++ b/linphone/coreapi/plugins/buddylookup/src/lookup.c @@ -22,15 +22,11 @@ typedef struct _BuddyLookupState{ #define get_buddy_lookup_state(ctx) ((BuddyLookupState*)((ctx)->data)) -static void set_proxy(SoupSession *session){ - SoupURI *uri=soup_uri_new("http://web-proxy.gre.hp.com:8080"); - g_object_set(G_OBJECT(session),"proxy-uri",uri,NULL); -} static void buddy_lookup_instance_init(SipSetupContext *ctx){ BuddyLookupState *s=ms_new0(BuddyLookupState,1); s->session=soup_session_sync_new(); - set_proxy(s->session); + //set_proxy(s->session); ctx->data=s; } @@ -157,6 +153,7 @@ 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.h b/linphone/gtk-glade/linphone.h index f4ea3dea2..7bfb1be8b 100644 --- a/linphone/gtk-glade/linphone.h +++ b/linphone/gtk-glade/linphone.h @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define PACKAGE_DATA_DIR "./" #ifndef LINPHONE_VERSION -#define LINPHONE_VERSION "3.0.0-20090309" +#define LINPHONE_VERSION "3.0.0-20090311" #endif #endif diff --git a/linphone/gtk-glade/linphone.iss b/linphone/gtk-glade/linphone.iss index d3985019c..11898c8e1 100755 --- a/linphone/gtk-glade/linphone.iss +++ b/linphone/gtk-glade/linphone.iss @@ -43,7 +43,6 @@ Source: "..\..\linphone-deps\bin\swscale.dll"; DestDir: "{app}"; Flags: ignoreve ;;Source: "..\..\linphone-deps\bin\libspeex-1.dll"; DestDir: "{app}"; Flags: ignoreversion ;;Source: "..\..\linphone-deps\bin\libspeexdsp-1.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\coreapi\linphone.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\coreapi\plugins\buddylookup\libbuddylookup.dll"; DestDir: "{app}\liblinphone\plugins"; Flags: ignoreversion Source: "..\mediastreamer2\build\win32native\mediastreamer2.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\oRTP\build\win32native\ortp.dll"; DestDir: "{app}"; Flags: ignoreversion ;;Sound files: @@ -74,6 +73,11 @@ Source: "..\..\gtk+-2.14.7\share\locale\sv\LC_MESSAGES\*"; DestDir: "{app}\share Source: "..\..\XLiquid_GTK-1.0.3\gtk-2.0\*"; DestDir: "{app}\share\themes\XLiquid_GTK-1.0.3\gtk-2.0"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files +;; BuddyLookup plugin +Source: "..\coreapi\plugins\buddylookup\libbuddylookup.dll"; DestDir: "{app}\liblinphone\plugins"; Flags: ignoreversion +Source: "..\..\libsoup\bin\libsoup-2.4-1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\gnutls-2.6.4\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion + [Icons] Name: "{group}\Linphone"; Filename: "{app}\linphone.exe" ; WorkingDir: "{app}" Name: "{userdesktop}\Linphone"; Filename: "{app}\linphone.exe"; WorkingDir: "{app}" ; Tasks: desktopicon