Commit ff8f8fac authored by smorlat's avatar smorlat

windows update to recent changes

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@234 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 2545db37
[Project] [Project]
FileName=liblinphone.dev FileName=liblinphone.dev
Name=liblinphone Name=liblinphone
UnitCount=18 UnitCount=21
Type=2 Type=2
Ver=3 Ver=3
IsCpp=1 IsCpp=1
...@@ -222,7 +222,7 @@ Libs=../oRTP/build/win32native;../mediastreamer2/build/win32native;../../linphon ...@@ -222,7 +222,7 @@ Libs=../oRTP/build/win32native;../mediastreamer2/build/win32native;../../linphon
PrivateResource= PrivateResource=
ResourceIncludes= ResourceIncludes=
MakeIncludes= MakeIncludes=
Compiler=-Wall -Werror_@@_-D_WIN32_WINNT=0x501_@@_-DINET6_@@_-DORTP_INET6_@@_-DORTP_STATIC_@@_-DVIDEO_ENABLED_@@_-ggdb_@@_-DOSIP_MT_@@_ Compiler=-Wall -Werror_@@_-D_WIN32_WINNT=0x501_@@_-DINET6_@@_-DORTP_INET6_@@_-DVIDEO_ENABLED_@@_-g_@@_-DOSIP_MT_@@_
CppCompiler= CppCompiler=
Linker= Linker=
PreprocDefines= PreprocDefines=
...@@ -241,3 +241,33 @@ SupportXPThemes=0 ...@@ -241,3 +241,33 @@ SupportXPThemes=0
CompilerSet=0 CompilerSet=0
compilerType=0 compilerType=0
[Unit19]
FileName=sipsetup.h
CompileCpp=1
Folder=liblinphone
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit20]
FileName=fonis.c
CompileCpp=0
Folder=liblinphone
Compile=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd= $(CC) -c fonis.c -o "Default Profile/fonis.o" $(CFLAGS)
[Unit21]
FileName=sipsetup.c
CompileCpp=0
Folder=liblinphone
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd= $(CC) -c sipsetup.c -o "Default Profile/sipsetup.o" $(CFLAGS)
...@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define PACKAGE_DATA_DIR "./" #define PACKAGE_DATA_DIR "./"
#ifndef LINPHONE_VERSION #ifndef LINPHONE_VERSION
#define LINPHONE_VERSION "3.0.0-20090106" #define LINPHONE_VERSION "3.0.0-20090112"
#endif #endif
#endif #endif
......
...@@ -894,7 +894,13 @@ int main(int argc, char *argv[]){ ...@@ -894,7 +894,13 @@ int main(int argc, char *argv[]){
} }
if ((lang=linphone_gtk_get_lang(config_file))!=NULL && lang[0]!='\0'){ if ((lang=linphone_gtk_get_lang(config_file))!=NULL && lang[0]!='\0'){
#ifdef WIN32
char tmp[128];
snprintf(tmp,sizeof(tmp),"LANG=%s",lang);
_putenv(tmp);
#else
setenv("LANG",lang,1); setenv("LANG",lang,1);
#endif
} }
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
......
...@@ -45,7 +45,9 @@ static int linphone_gtk_get_new_version(const char *version_url, char *version, ...@@ -45,7 +45,9 @@ static int linphone_gtk_get_new_version(const char *version_url, char *version,
if (InternetReadFile(hConnect,version,size,&dwDownloaded) && dwDownloaded>0){ if (InternetReadFile(hConnect,version,size,&dwDownloaded) && dwDownloaded>0){
version[dwDownloaded]='\0'; version[dwDownloaded]='\0';
ms_message("Got response: %s", version); ms_message("Got response: %s", version);
ret=0; /*check this not just html containing 404 not found*/
if (strstr(version,"html")==0)
ret=0;
} }
// Close any open handles. // Close any open handles.
......
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