X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a9422f39e34f55d1925d1ebef35ace1a0f1c2f6a..57b8bf11164ae575c86b7b739c79d0aa112f28fc:/settings.c

diff --git a/settings.c b/settings.c
index 6204227c..181708e3 100644
--- a/settings.c
+++ b/settings.c
@@ -3,6 +3,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"
 #include "storage.h"
@@ -41,6 +48,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
     }
     write_setting_i (sesskey, "CloseOnExit", !!cfg->close_on_exit);
     write_setting_i (sesskey, "WarnOnClose", !!cfg->warn_on_close);
+    write_setting_i (sesskey, "PingInterval", cfg->ping_interval);
     write_setting_s (sesskey, "TerminalType", cfg->termtype);
     write_setting_s (sesskey, "TerminalSpeed", cfg->termspeed);
     {
@@ -120,6 +128,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
     }
     write_setting_i (sesskey, "KoiWinXlat", cfg->xlat_enablekoiwin);
     write_setting_i (sesskey, "88592Xlat", cfg->xlat_88592w1250);
+    write_setting_i (sesskey, "88592-CP852", cfg->xlat_88592cp852);
     write_setting_i (sesskey, "CapsLockCyr", cfg->xlat_capslockcyr);
     write_setting_i (sesskey, "ScrollBar", cfg->scrollbar);
     write_setting_i (sesskey, "ScrollOnKey", cfg->scroll_on_key);
@@ -150,6 +159,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
 
     gppi (sesskey, "CloseOnExit", 1, &cfg->close_on_exit);
     gppi (sesskey, "WarnOnClose", 1, &cfg->warn_on_close);
+    gppi (sesskey, "PingInterval", 0, &cfg->ping_interval);
     gpps (sesskey, "TerminalType", "xterm", cfg->termtype,
 	  sizeof(cfg->termtype));
     gpps (sesskey, "TerminalSpeed", "38400,38400", cfg->termspeed,
@@ -263,6 +273,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
     }
     gppi (sesskey, "KoiWinXlat", 0, &cfg->xlat_enablekoiwin);
     gppi (sesskey, "88592Xlat", 0, &cfg->xlat_88592w1250);
+    gppi (sesskey, "88592-CP852", 0, &cfg->xlat_88592cp852);
     gppi (sesskey, "CapsLockCyr", 0, &cfg->xlat_capslockcyr);
     gppi (sesskey, "ScrollBar", 1, &cfg->scrollbar);
     gppi (sesskey, "ScrollOnKey", 0, &cfg->scroll_on_key);
@@ -280,6 +291,21 @@ void do_defaults (char *session, Config *cfg) {
 	load_settings ("Default Settings", FALSE, cfg);
 }
 
+static int sessioncmp(const void *av, const void *bv) {
+    const char *a = *(const char *const *)av;
+    const char *b = *(const char *const *)bv;
+
+    /*
+     * Alphabetical order, except that "Default Settings" is a
+     * special case and comes first.
+     */
+    if (!strcmp(a, "Default Settings"))
+        return -1;                     /* a comes first */
+    if (!strcmp(b, "Default Settings"))
+        return +1;                     /* b comes first */
+    return strcmp(a, b);               /* otherwise, compare normally */
+}
+
 void get_sesslist(int allocate) {
     static char otherbuf[2048];
     static char *buffer;
@@ -311,24 +337,23 @@ void get_sesslist(int allocate) {
 	buffer[buflen] = '\0';
 
 	p = buffer;
-	nsessions = 1;		       /* "Default Settings" counts as one */
+	nsessions = 0;
 	while (*p) {
-	    if (strcmp(p, "Default Settings"))
-		nsessions++;
+            nsessions++;
 	    while (*p) p++;
 	    p++;
 	}
 
 	sessions = smalloc(nsessions * sizeof(char *));
-	sessions[0] = "Default Settings";
 	p = buffer;
-	i = 1;
+	i = 0;
 	while (*p) {
-	    if (strcmp(p, "Default Settings"))
-		sessions[i++] = p;
+            sessions[i++] = p;
 	    while (*p) p++;
 	    p++;
 	}
+
+        qsort(sessions, i, sizeof(char *), sessioncmp);
     } else {
 	sfree (buffer);
 	sfree (sessions);