nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Loose end from r5031: the Kex panel should only be displayed in

Browse Source 
mid-session if we are not using SSHv1. I've done this by introducing
a generic `cfg_info' function which every back end can use to
communicate an int's worth of data to setup_config_box; in SSH
that's the protocol version in use, and in everything else it's
currently zero.

[originally from svn r5040]
[r5031 == d77102a8d5]
This commit is contained in:
Simon Tatham
2004-12-29 12:32:25 +00:00
parent 6120d91507
commit b0bf176dfb
16 changed files with 99 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
windows/windlg.c
View File

@ -598,7 +598,7 @@ int do_config(void)
int ret;
ctrlbox = ctrl_new_box();
setup_config_box(ctrlbox, &sesslist, FALSE, 0);
setup_config_box(ctrlbox, &sesslist, FALSE, 0, 0);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), FALSE);
dp_init(&dp);
winctrl_init(&ctrls_base);
@ -624,7 +624,7 @@ int do_config(void)
return ret;
}
int do_reconfig(HWND hwnd)
int do_reconfig(HWND hwnd, int protcfginfo)
{
Config backup_cfg;
int ret;
@ -632,7 +632,7 @@ int do_reconfig(HWND hwnd)
backup_cfg = cfg; /* structure copy */
ctrlbox = ctrl_new_box();
setup_config_box(ctrlbox, &sesslist, TRUE, cfg.protocol);
setup_config_box(ctrlbox, &sesslist, TRUE, cfg.protocol, protcfginfo);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), TRUE);
dp_init(&dp);
winctrl_init(&ctrls_base);

2
windows/window.c
View File

@ -1900,7 +1900,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
GetWindowText(hwnd, cfg.wintitle, sizeof(cfg.wintitle));
prev_cfg = cfg;
if (!do_reconfig(hwnd))
if (!do_reconfig(hwnd, back ? back->cfg_info(backhandle) : 0))
break;
{

2
windows/winstuff.h
View File

@ -327,7 +327,7 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
*/
void defuse_showwindow(void);
int do_config(void);
int do_reconfig(HWND);
int do_reconfig(HWND, int);
void showeventlog(HWND);
void showabout(HWND);
void force_normal(HWND hwnd);