nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-23 06:59:25 -05:00
Code Issues Projects Releases Wiki Activity

Fixed a PuTTYtel startup assertion failure introduced in r8305.

Browse Source 
While I'm here, a cosmetic PuTTYtel change: remove a reference to SSH from the
"logical host name" label in PuTTYtel only.

[originally from svn r8331]
[r8305 == ca6fc3a4daf51166a15693feffc967bee9e3f59a]
This commit is contained in:
Jacob Nevins 2008-11-25 18:43:52 +00:00
parent caf4100ff3
commit 01a7673ae9
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.c
View File

@ -1729,14 +1729,18 @@ void setup_config_box(struct controlbox *b, int midsession,
NULL); NULL);
#endif #endif
{
char *label = backend_from_proto(PROT_SSH) ?
"Logical name of remote host (e.g. for SSH key lookup):" :
"Logical name of remote host:";
s = ctrl_getset(b, "Connection", "identity", s = ctrl_getset(b, "Connection", "identity",
"Logical name of remote host"); "Logical name of remote host");
ctrl_editbox(s, "Logical name of remote host (e.g. for SSH key lookup):", ctrl_editbox(s, label, 'm', 100,
'm', 100,
HELPCTX(connection_loghost), HELPCTX(connection_loghost),
dlg_stdeditbox_handler, I(offsetof(Config,loghost)), dlg_stdeditbox_handler, I(offsetof(Config,loghost)),
I(sizeof(((Config *)0)->loghost))); I(sizeof(((Config *)0)->loghost)));
} }
}
/* /*
* A sub-panel Connection/Data, containing options that * A sub-panel Connection/Data, containing options that

2
windows/wincfg.c
View File

@ -382,9 +382,11 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
* $XAUTHORITY is not reliable on Windows, so we provide a * $XAUTHORITY is not reliable on Windows, so we provide a
* means to override it. * means to override it.
*/ */
if (backend_from_proto(PROT_SSH)) {
s = ctrl_getset(b, "Connection/SSH/X11", "x11", "X11 forwarding"); s = ctrl_getset(b, "Connection/SSH/X11", "x11", "X11 forwarding");
ctrl_filesel(s, "X authority file for local display", 't', ctrl_filesel(s, "X authority file for local display", 't',
NULL, FALSE, "Select X authority file", NULL, FALSE, "Select X authority file",
HELPCTX(ssh_tunnels_xauthority), HELPCTX(ssh_tunnels_xauthority),
dlg_stdfilesel_handler, I(offsetof(Config, xauthfile))); dlg_stdfilesel_handler, I(offsetof(Config, xauthfile)));
}
} }