X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fgtkdlg.c;h=77661299c171f41a894d9ebbcdc9ced01e4b7c4e;hb=162d04d360d8d70269ad17a02d44a983cb8dbfef;hp=8ab85981d2d3849be584c2689366cad33c8bcb44;hpb=f73fcb042423866a06b9e41b6934906a0fe9502e;p=PuTTY.git

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 8ab85981..77661299 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -1956,7 +1956,6 @@ int do_config_box(const char *title, Config *cfg, int midsession,
     GtkTreeItem *treeitemlevels[8];
     GtkTree *treelevels[8];
     struct dlgparam dp;
-    struct sesslist sl;
     struct Shortcuts scs;
 
     struct selparam *selparams = NULL;
@@ -1964,8 +1963,6 @@ int do_config_box(const char *title, Config *cfg, int midsession,
 
     dlg_init(&dp);
 
-    get_sesslist(&sl, TRUE);
-
     listitemheight = get_listitemheight();
 
     for (index = 0; index < lenof(scs.sc); index++) {
@@ -1975,7 +1972,7 @@ int do_config_box(const char *title, Config *cfg, int midsession,
     window = gtk_dialog_new();
 
     ctrlbox = ctrl_new_box();
-    setup_config_box(ctrlbox, &sl, midsession, cfg->protocol, protcfginfo);
+    setup_config_box(ctrlbox, midsession, cfg->protocol, protcfginfo);
     unix_setup_config_box(ctrlbox, midsession);
     gtk_setup_config_box(ctrlbox, midsession, window);
 
@@ -2161,7 +2158,6 @@ int do_config_box(const char *title, Config *cfg, int midsession,
 
     gtk_main();
 
-    get_sesslist(&sl, FALSE);
     dlg_cleanup(&dp);
     sfree(selparams);
 
@@ -2347,13 +2343,12 @@ int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 
     sfree(text);
 
-    if (ret == 0)
-        return 0;                      /* do not continue with connection */
-    else {
-        if (ret == 2)
-            store_host_key(host, port, keytype, keystr);
-        return 1;                      /* continue with connection */
-    }
+    if (ret == 2) {
+	store_host_key(host, port, keytype, keystr);
+	return 1;		       /* continue with connection */
+    } else if (ret == 1)
+	return 1;		       /* continue with connection */
+    return 0;			       /* do not continue with connection */
 }
 
 /*
@@ -2429,7 +2424,8 @@ static void licence_clicked(GtkButton *button, gpointer data)
 
 	"Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
 	"Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas "
-	"Barry, Justin Bradford, Ben Harris, Malcolm Smith, and CORE SDI S.A.\n\n"
+	"Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, "
+	"Markus Kuhn, and CORE SDI S.A.\n\n"
 
 	"Permission is hereby granted, free of charge, to any person "
 	"obtaining a copy of this software and associated documentation "