X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=macosx%2Fosxdlg.m;h=84a761fe68e0ea873c4c6c48b38abedf51aa7c62;hb=9dd9860cc84f82309de64c33e2813c6e9dc60749;hp=f32b090979c9636df3e17f8eac4ca2c8429e00a6;hpb=fe8114d90b3a7719a22f2c3ebe18154191e4ddbd;p=PuTTY.git diff --git a/macosx/osxdlg.m b/macosx/osxdlg.m index f32b0909..84a761fe 100644 --- a/macosx/osxdlg.m +++ b/macosx/osxdlg.m @@ -123,12 +123,10 @@ int hmin = 0; int panelht = 0; - get_sesslist(&sl, TRUE); - ctrlbox = ctrl_new_box(); - setup_config_box(ctrlbox, &sl, FALSE /*midsession*/, aCfg.protocol, + setup_config_box(ctrlbox, FALSE /*midsession*/, aCfg.protocol, 0 /* protcfginfo */); - unix_setup_config_box(ctrlbox, FALSE /*midsession*/); + unix_setup_config_box(ctrlbox, FALSE /*midsession*/, aCfg.protocol); cfg = aCfg; /* structure copy */ @@ -412,8 +410,8 @@ static void verify_ssh_host_key_callback(void *ctx, int result) sfree(state); } -int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, - char *keystr, char *fingerprint, +int verify_ssh_host_key(void *frontend, char *host, int port, + const char *keytype, char *keystr, char *fingerprint, void (*callback)(void *ctx, int result), void *ctx) { static const char absenttxt[] = @@ -492,7 +490,7 @@ static void connection_fatal_callback(void *ctx, int result) [win endSession:FALSE]; } -void connection_fatal(void *frontend, char *p, ...) +void connection_fatal(void *frontend, const char *p, ...) { SessionWindow *win = (SessionWindow *)frontend; va_list ap;