From 8ee447f8c5be977ed2478f376e90a7d8d22ee7d3 Mon Sep 17 00:00:00 2001 From: cyd01 Date: Sat, 1 May 2021 22:35:33 +0200 Subject: [PATCH] Tagging the 0.74.4.12 release of the KiTTY project. --- 0.74_My_PuTTY/version.h | 2 +- 0.74_My_PuTTY/windows/version_minor.txt | 2 +- docs/version.txt | 2 +- kitty.c | 11 ----------- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/0.74_My_PuTTY/version.h b/0.74_My_PuTTY/version.h index 3355e34..265f3d9 100644 --- a/0.74_My_PuTTY/version.h +++ b/0.74_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.74 #define TEXTVER "Release 0.74" #define SSHVER "-Release-0.74" -#define BINARY_VERSION 0,74,4,11 +#define BINARY_VERSION 0,74,4,12 #define SOURCE_COMMIT "unavailable" diff --git a/0.74_My_PuTTY/windows/version_minor.txt b/0.74_My_PuTTY/windows/version_minor.txt index b4de394..48082f7 100644 --- a/0.74_My_PuTTY/windows/version_minor.txt +++ b/0.74_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -11 +12 diff --git a/docs/version.txt b/docs/version.txt index 5286ba3..c1e297d 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -0.74.4.11 \ No newline at end of file +0.74.4.12 \ No newline at end of file diff --git a/kitty.c b/kitty.c index e0729a5..9f8f17b 100644 --- a/kitty.c +++ b/kitty.c @@ -1439,7 +1439,6 @@ int DelParameter( const char * key, const char * name ) { // Test la configuration (mode file ou registry) et charge le fichier kitty.sav si besoin void GetSaveMode( void ) { -#ifndef MOD_PORTABLE char buffer[256] ; if( readINI( KittyIniFile, INIT_SECTION, "savemode", buffer ) ) { while( (buffer[strlen(buffer)-1]=='\n')||(buffer[strlen(buffer)-1]=='\r')||(buffer[strlen(buffer)-1]==' ')||(buffer[strlen(buffer)-1]=='\t') ) buffer[strlen(buffer)-1]='\0'; @@ -1447,7 +1446,6 @@ void GetSaveMode( void ) { else if( !stricmp( buffer, "file" ) ) IniFileFlag = SAVEMODE_FILE ; else if( !stricmp( buffer, "dir" ) ) { IniFileFlag = SAVEMODE_DIR ; DirectoryBrowseFlag = 1 ; } } -#endif if( IniFileFlag!=SAVEMODE_DIR ) DirectoryBrowseFlag = 0 ; } @@ -5441,12 +5439,6 @@ void InitNameConfigFile( void ) { if( getenv("KITTY_INI_FILE") != NULL ) { strcpy( buffer, getenv("KITTY_INI_FILE") ) ; } if( !existfile( buffer ) ) { sprintf( buffer, "%s\\%s", InitialDirectory, DEFAULT_INIT_FILE ) ; -#ifdef MOD_PORTABLE - if( !existfile( buffer ) ) { - sprintf( buffer, "%s\\putty.ini", InitialDirectory ) ; - if( !existfile( buffer ) ) { - sprintf( buffer, "%s\\%s", InitialDirectory, DEFAULT_INIT_FILE ) ; -#else if( !existfile( buffer ) ) { sprintf( buffer, "%s\\putty.ini", InitialDirectory ) ; if( !existfile( buffer ) ) { @@ -5456,7 +5448,6 @@ void InitNameConfigFile( void ) { CreateDirectory( buffer, NULL ) ; sprintf( buffer, "%s\\%s\\%s", getenv("APPDATA"), INIT_SECTION, DEFAULT_INIT_FILE ) ; } -#endif } } } @@ -5466,7 +5457,6 @@ void InitNameConfigFile( void ) { if( KittySavFile != NULL ) { free( KittySavFile ) ; } KittySavFile=NULL ; sprintf( buffer, "%s\\%s", InitialDirectory, DEFAULT_SAV_FILE ) ; -#ifndef MOD_PORTABLE if( !existfile( buffer ) ) { sprintf( buffer, "%s\\%s\\%s", getenv("APPDATA"), INIT_SECTION, DEFAULT_SAV_FILE ) ; if( !existfile( buffer ) ) { @@ -5475,7 +5465,6 @@ void InitNameConfigFile( void ) { sprintf( buffer, "%s\\%s\\%s", getenv("APPDATA"), INIT_SECTION, DEFAULT_SAV_FILE ) ; } } -#endif KittySavFile=(char*)malloc( strlen( buffer)+2 ) ; strcpy( KittySavFile, buffer) ; sprintf( buffer, "%s\\kitty.dft", InitialDirectory ) ;