X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/4dee460f19582a5707e42eb1aa2025f29c7b9d8c..38f0c08ea9a626c97a1d97b6d56d6f44b6a14572:/unix/gtkdlg.c

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 4ca84573..0ea6615f 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -152,6 +152,8 @@ static void dlg_init(struct dlgparam *dp)
     dp->coloursel_result.ok = FALSE;
     dp->treeitems = NULL;
     dp->window = dp->cancelbutton = dp->currtreeitem = NULL;
+    dp->flags = 0;
+    dp->currfocus = NULL;
 }
 
 static void dlg_cleanup(struct dlgparam *dp)
@@ -1943,7 +1945,8 @@ int get_listitemheight(void)
     return req.height;
 }
 
-int do_config_box(const char *title, Config *cfg, int midsession)
+int do_config_box(const char *title, Config *cfg, int midsession,
+		  int protcfginfo)
 {
     GtkWidget *window, *hbox, *vbox, *cols, *label,
 	*tree, *treescroll, *panels, *panelvbox;
@@ -1972,7 +1975,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);
+    setup_config_box(ctrlbox, &sl, midsession, cfg->protocol, protcfginfo);
     unix_setup_config_box(ctrlbox, midsession, window);
 
     gtk_window_set_title(GTK_WINDOW(window), title);
@@ -2349,22 +2352,19 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 }
 
 /*
- * Ask whether the selected cipher is acceptable (since it was
+ * Ask whether the selected algorithm is acceptable (since it was
  * below the configured 'warn' threshold).
- * cs: 0 = both ways, 1 = client->server, 2 = server->client
  */
-void askcipher(void *frontend, char *ciphername, int cs)
+void askalg(void *frontend, const char *algtype, const char *algname)
 {
     static const char msg[] =
-	"The first %scipher supported by the server is "
+	"The first %s supported by the server is "
 	"%s, which is below the configured warning threshold.\n"
 	"Continue with connection?";
     char *text;
     int ret;
 
-    text = dupprintf(msg, (cs == 0) ? "" :
-                     (cs == 1) ? "client-to-server " : "server-to-client ",
-                     ciphername);
+    text = dupprintf(msg, algtype, algname);
     ret = messagebox(GTK_WIDGET(get_window(frontend)),
 		     "PuTTY Security Alert", text,
 		     string_width("Continue with connection?"),
@@ -2423,7 +2423,7 @@ 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, and CORE SDI S.A.\n\n"
+	"Barry, Justin Bradford, Ben Harris, Malcolm Smith, 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 "