X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fgtkdlg.c;h=2a2b3ab749ae7530e33c15c2ac0a70e6cabd1782;hb=4c31b113a6deb4894b640e4989ae9ef1f8063c0e;hp=ea39c5ede7909cb7b7203bebfdaf4ef9295851bb;hpb=9a242f06baa48c6cf91180be49e812317ded0e55;p=PuTTY.git

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index ea39c5ed..2a2b3ab7 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)
@@ -2296,7 +2298,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     static const char absenttxt[] =
 	"The server's host key is not cached. You have no guarantee "
 	"that the server is the computer you think it is.\n"
-	"The server's key fingerprint is:\n"
+	"The server's %s key fingerprint is:\n"
 	"%s\n"
 	"If you trust this host, press \"Accept\" to add the key to "
 	"PuTTY's cache and carry on connecting.\n"
@@ -2310,7 +2312,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 	"cached. This means that either the server administrator "
 	"has changed the host key, or you have actually connected "
 	"to another computer pretending to be the server.\n"
-	"The new key fingerprint is:\n"
+	"The new %s key fingerprint is:\n"
 	"%s\n"
 	"If you were expecting this change and trust the new key, "
 	"press \"Accept\" to update PuTTY's cache and continue connecting.\n"
@@ -2330,7 +2332,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     if (ret == 0)		       /* success - key matched OK */
 	return;
 
-    text = dupprintf((ret == 2 ? wrongtxt : absenttxt), fingerprint);
+    text = dupprintf((ret == 2 ? wrongtxt : absenttxt), keytype, fingerprint);
 
     ret = messagebox(GTK_WIDGET(get_window(frontend)),
 		     "PuTTY Security Alert", text,
@@ -2419,11 +2421,11 @@ static void licence_clicked(GtkButton *button, gpointer data)
     char *title;
 
     char *licence =
-	"Copyright 1997-2003 Simon Tatham.\n\n"
+	"Copyright 1997-2004 Simon Tatham.\n\n"
 
 	"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 "
@@ -2499,7 +2501,7 @@ void about_box(void *window)
 		       w, FALSE, FALSE, 5);
     gtk_widget_show(w);
 
-    w = gtk_label_new("Copyright 1997-2003 Simon Tatham. All rights reserved");
+    w = gtk_label_new("Copyright 1997-2004 Simon Tatham. All rights reserved");
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox),
 		       w, FALSE, FALSE, 5);
     gtk_widget_show(w);