diff --git a/0.73_My_PuTTY/version.h b/0.73_My_PuTTY/version.h index 2422603..5cb6e49 100644 --- a/0.73_My_PuTTY/version.h +++ b/0.73_My_PuTTY/version.h @@ -1,6 +1,5 @@ -/* Generated by automated build script */ -#define RELEASE 0.72 -#define TEXTVER "Release 0.72" -#define SSHVER "-Release-0.72" -#define BINARY_VERSION 0,72,0,0 -#define SOURCE_COMMIT "75cd6c8b2703137e574223d90d2f3ead9ca34acc" +#define RELEASE 0.73 +#define TEXTVER "Release 0.73" +#define SSHVER "-Release-0.73" +#define BINARY_VERSION 0,73,1,1 +#define SOURCE_COMMIT "unavailable" diff --git a/0.73_My_PuTTY/windows/MAKEFILE.MINGW b/0.73_My_PuTTY/windows/MAKEFILE.MINGW index ee5e5ae..304fc27 100644 --- a/0.73_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.73_My_PuTTY/windows/MAKEFILE.MINGW @@ -1994,6 +1994,8 @@ cleanall: clean FORCE version: expr `cat version_minor.txt|tr -d '\r\n '` + 1 > version_minor.txt cat version_major.txt version_minor.txt|tr -d '\r\n '|sed 's/^.//'|sed 's/"/./' > version.txt + v=`cat version_major.txt|tr -d '"\r\n '|sed 's/\.[0-9]*$$//'` ; printf '#define RELEASE '$${v}'\n#define TEXTVER "Release '$${v}'"\n#define SSHVER "-Release-'$${v}'"\n#define BINARY_VERSION '`cat version.txt|sed 's/\./,/g'`'\n#define SOURCE_COMMIT "unavailable"\n' > ../version.h + cat version.txt xml: cat ../../kitty.xml | sed 's/.*<\/Program_Version>/'`cat version.txt`'<\/Program_Version>/' | sed 's/.*<\/Program_Release_Month>/'`date +"%m"`'<\/Program_Release_Month>/' | sed 's/.*<\/Program_Release_Day>/'`date +"%d"`'<\/Program_Release_Day>/' | sed 's/.*<\/Program_Release_Year>/'`date +"%Y"`'<\/Program_Release_Year>/' | sed 's/.*<\/File_Size_Bytes>/'`ls -l putty.exe|awk '{print $5}'`'<\/File_Size_Bytes>/' > kitty.xml diff --git a/0.73_My_PuTTY/windows/version_major.txt b/0.73_My_PuTTY/windows/version_major.txt index 2c21fd7..b8f6efc 100644 --- a/0.73_My_PuTTY/windows/version_major.txt +++ b/0.73_My_PuTTY/windows/version_major.txt @@ -1 +1 @@ -"0.73.0" +"0.73.1" diff --git a/0.73_My_PuTTY/windows/version_minor.txt b/0.73_My_PuTTY/windows/version_minor.txt index 0cfbf08..d00491f 100644 --- a/0.73_My_PuTTY/windows/version_minor.txt +++ b/0.73_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -2 +1 diff --git a/0.73_My_PuTTY/windows/window.c b/0.73_My_PuTTY/windows/window.c index e78da86..f858c0e 100644 --- a/0.73_My_PuTTY/windows/window.c +++ b/0.73_My_PuTTY/windows/window.c @@ -1187,8 +1187,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) else icon_m = LoadIcon(inst, MAKEINTRESOURCE(IDI_MAINICON)); int xpos_init=0, ypos_init=0 ; - if( (conf_get_bool(conf,CONF_saveonexit)||conf_get_bool(conf,CONF_save_windowpos)) - && (conf_get_int(conf,CONF_xpos)>=0) && (conf_get_int(conf,CONF_ypos)>=0) ) { + if( (conf_get_bool(conf,CONF_saveonexit)||conf_get_bool(conf,CONF_save_windowpos) ) + /*&& (conf_get_int(conf,CONF_xpos)>=0) && (conf_get_int(conf,CONF_ypos)>=0)*/ ) { xpos_init=conf_get_int(conf,CONF_xpos) ; ypos_init=conf_get_int(conf,CONF_ypos) ; } @@ -1392,7 +1392,7 @@ TrayIcone.hWnd = hwnd ; #ifdef MOD_PERSO if( !PuttyFlag ) if( (conf_get_bool(conf,CONF_saveonexit)||conf_get_bool(conf,CONF_save_windowpos)) - && (xpos_init>=0) && (ypos_init>=0) ) { + /*&& (xpos_init>=0) && (ypos_init>=0)*/ ) { MoveWindow(hwnd, xpos_init, ypos_init, guess_width, guess_height, TRUE ); } #endif diff --git a/kitty.c b/kitty.c index 28072d7..ba01d8a 100644 --- a/kitty.c +++ b/kitty.c @@ -2605,7 +2605,7 @@ void SaveWindowCoord( Conf * conf ) { conf_set_int(conf,CONF_height,height) ; conf_set_int(conf,CONF_windowstate,windowstate) ; conf_set_int(conf,CONF_transparencynumber,transparency) ; - save_settings( conf_get_str(conf,CONF_sessionname), conf ) ; + save_settings( conf_get_str(conf,CONF_sessionname), conf ) ; } } }