Merge branch '2.2' into 3.0

# Conflicts: # gns3/crash_report.py # gns3/version.py # requirements.txt
GNS3 · Dec 27, 2022 · 25e665f · 25e665f
2 parents 617cf7e + 6e7947e
commit 25e665f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 # Change Log
 
+## 2.2.35.1 10/11/2022
+
+* Re-release Web-Ui v2.2.35
+
 ## 2.2.35 08/11/2022
 
 * Fix "variables": [] in project file leads to unlimited increase of empty name/value pairs in GUI. Fixes #3397

diff --git a/gns3/settings.py b/gns3/settings.py
@@ -56,7 +56,6 @@
         program_files_x86 = program_files = os.environ["PROGRAMFILES"]
 
     PRECONFIGURED_TELNET_CONSOLE_COMMANDS = {'Putty (normal standalone version)': 'putty_standalone.exe -telnet %h %p -loghost "%d"',
-                                             'Putty (custom deprecated version)': 'putty.exe -telnet %h %p -wt "%d" -gns3 5 -skin 4',
                                              'MobaXterm': r'"{}\Mobatek\MobaXterm Personal Edition\MobaXterm.exe" -newtab "telnet %h %p"'.format(program_files_x86),
                                              'Royal TS V3': r'{}\code4ward.net\Royal TS V3\RTS3App.exe /connectadhoc:%h /adhoctype:terminal /p:IsTelnetConnection="true" /p:ConnectionType="telnet;Telnet Connection" /p:Port="%p" /p:Name="%d"'.format(program_files),
                                              'Royal TS V5': r'"{}\Royal TS V5\RoyalTS.exe" /protocol:terminal /using:adhoc /uri:"%h" /property:Port="%p" /property:IsTelnetConnection="true" /property:Name="%d"'.format(program_files_x86),