Commit 7f5cfba1 authored by smorlat's avatar smorlat

work in progress for buddylookup on windows

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@328 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 9d640def
......@@ -191,7 +191,7 @@ Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd= $(CC) -c general_state.c -o "Default Profile/general_state.o" $(CFLAGS)
BuildCmd=$(CC) -c general_state.c -o "Default Profile/general_state.o" $(CFLAGS)
[VersionInfo]
Major=0
......@@ -215,7 +215,7 @@ UnitCount=18
[Profile1]
ProfileName=Default Profile
Type=2
Type=3
ObjFiles=
Includes=../oRTP/include;../mediastreamer2/include;../../linphone-deps/include
Libs=../oRTP/build/win32native;../mediastreamer2/build/win32native;../../linphone-deps/lib
......@@ -224,14 +224,14 @@ ResourceIncludes=
MakeIncludes=
Compiler=-Wall -Werror_@@_-D_WIN32_WINNT=0x501_@@_-DINET6_@@_-DORTP_INET6_@@_-DVIDEO_ENABLED_@@_-g_@@_-DOSIP_MT_@@_-DIN_LINPHONE_@@_
CppCompiler=
Linker=
Linker=-lmediastreamer2_@@_-lortp_@@_-leXosip2_@@_-losipparser2_@@_-lws2_32_@@_
PreprocDefines=
CompilerSettings=0000000000010000000000
Icon=
ExeOutput=
ObjectOutput=Default Profile
OverrideOutput=0
OverrideOutputName=liblinphone.lib
OverrideOutput=1
OverrideOutputName=linphone.dll
HostApplication=
CommandLine=
UseCustomMakefile=0
......
[Project]
FileName=libbuddylookup.dev
Name=libbuddylookup
UnitCount=1
PchHead=-1
PchSource=-1
Ver=3
IsCpp=1
ProfilesCount=2
ProfileIndex=0
Folders=
[Unit1]
FileName=src\lookup.c
CompileCpp=0
Folder=libbuddylookup
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[VersionInfo]
Major=0
Minor=1
Release=1
Build=1
LanguageID=1033
CharsetID=1252
CompanyName=
FileVersion=
FileDescription=
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=
AutoIncBuildNrOnRebuild=0
AutoIncBuildNrOnCompile=0
[Profile1]
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
ResourceIncludes=
MakeIncludes=
Compiler=-DBUILDING_DLL=1_@@_-DIN_LINPHONE_@@_
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=
CompilerSettings=0000000001001000000000
Icon=
ExeOutput=
ObjectOutput=Output\MingW
OverrideOutput=0
OverrideOutputName=libbuddylookup.dll
HostApplication=
CommandLine=
UseCustomMakefile=0
CustomMakefile=
IncludeVersionInfo=0
SupportXPThemes=0
CompilerSet=0
compilerType=0
[Profile2]
ProfileName=Visual C++ 2005
Type=3
ObjFiles=
Includes=
Libs=
ResourceIncludes=
MakeIncludes=
Compiler=/DBUILDING_DLL=1
CppCompiler=/DBUILDING_DLL=1
Linker=
PreprocDefines=
CompilerSettings=000000000000010000000000000000000000
Icon=
ExeOutput=Output\Visual C++ 2005
ObjectOutput=Objects\Visual C++ 2005
OverrideOutput=0
OverrideOutputName=
HostApplication=
CommandLine=
UseCustomMakefile=0
CustomMakefile=
IncludeVersionInfo=0
SupportXPThemes=0
CompilerSet=1
compilerType=1
#ifdef IN_LINPHONE
#include "linphonecore.h"
#include "lpconfig.h"
#else
#include <linphone/linphonecore.h>
#include <linphone/lpconfig.h>
#endif
#include <libsoup/soup.h>
static bool_t buddy_lookup_init(void){
......@@ -17,9 +22,15 @@ 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);
ctx->data=s;
}
......@@ -145,6 +156,7 @@ static void * process_xml_rpc_request(void *up){
ms_message("Got a response from server, yeah !");
xml_rpc_parse_response(ctx,sm);
}else{
ms_error("request failed, error-code=%i (%s)",code,soup_status_get_phrase(code));
s->status=BuddyLookupFailure;
}
s->processing=FALSE;
......
......@@ -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-20090306"
#define LINPHONE_VERSION "3.0.0-20090309"
#endif
#endif
......
......@@ -42,6 +42,8 @@ Source: "..\..\linphone-deps\bin\avutil-49.dll"; DestDir: "{app}"; Flags: ignore
Source: "..\..\linphone-deps\bin\swscale.dll"; DestDir: "{app}"; Flags: ignoreversion
;;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:
......
......@@ -288,12 +288,13 @@ int ms_load_plugins(const char *dir){
/* load library */
HINSTANCE os_handle;
UINT em;
em = SetErrorMode (SEM_FAILCRITICALERRORS);
// em = SetErrorMode (SEM_FAILCRITICALERRORS);
em = SetErrorMode (0);
snprintf(szPluginFile, sizeof(szPluginFile), "%s\\%s", szDirPath, FileData.cFileName);
os_handle = LoadLibraryEx (szPluginFile, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if (os_handle==NULL)
{
ms_warning("Fail to load plugin %s: error %i",szPluginFile,GetLastError());
os_handle = LoadLibraryEx (szPluginFile, NULL, 0);
}
SetErrorMode (em);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment