PuTTy: Diff

Differences From Artifact [b3b84314bc]:

File unix/gtkwin.c — part of check-in [d2a830c19a] at 2005-03-18 20:26:58 on branch trunk — Try to make our PGP signing more useful: * All the PuTTY tools for Windows and Unix now contain the fingerprints of the Master Keys. The method for accessing them is crude but universal: a new "-pgpfp" command-line option. (Except Unix PuTTYgen, which takes "--pgpfp" just to be awkward.) * Move the key policy discussion from putty-website/keys.html to putty/doc/pgpkeys.but, and autogenerate the former from the latter. Also tweak the text somewhat and include the fingerprints of the Master Keys themselves. (I've merged the existing autogeneration scripts into a single new one; I've left the old scripts and keys.html around until such time as the webmonster reviews the changes and plumbs in the new script; he should remove the old files then.) (user: jacob size: 104346)

To Artifact [c73eb446d9]:

File unix/gtkwin.c — part of check-in [11a4164f51] at 2005-04-06 20:36:28 on branch trunk — If a new session was saved from Change Settings, a side-effect on Windows was that the global `sesslist' got out of sync with the saved-sessions submenu, causing the latter to launch the wrong sessions. Also, Change Settings wasn't getting a fresh session list, so if the set of sessions had changed since session startup it wouldn't reflect that (at least until a session was saved). Fixed (on all platforms). Therefore, since the global sesslist didn't seem to be useful, I've got rid of it; config.c creates one as needed, as do the frontends. (Not tried compiling Mac changes.) Also, we now build the saved-sessions submenu on demand on Windows and Unix. (This should probably also be done on the Mac.) (user: jacob size: 104734)

︙			︙
3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234	void saved_session_freedata(GtkMenuItem item, gpointer data) { char str = (char )gtk_object_get_data(GTK_OBJECT(item), "user-data"); sfree(str); } void update_specials_menu(void frontend) { struct gui_data inst = (struct gui_data )frontend; const struct telnet_special *specials;	> > > > > > > > > > > > > > > > > > > > > > > > > > >	3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261	void saved_session_freedata(GtkMenuItem item, gpointer data) { char str = (char )gtk_object_get_data(GTK_OBJECT(item), "user-data"); sfree(str); } static void update_savedsess_menu(GtkMenuItem menuitem, gpointer data) { struct gui_data inst = (struct gui_data )data; struct sesslist sesslist; int i; gtk_container_foreach(GTK_CONTAINER(inst->sessionsmenu), (GtkCallback)gtk_widget_destroy, NULL); get_sesslist(&sesslist, TRUE); for (i = 1; i < sesslist.nsessions; i++) { GtkWidget menuitem = gtk_menu_item_new_with_label(sesslist.sessions[i]); gtk_container_add(GTK_CONTAINER(inst->sessionsmenu), menuitem); gtk_widget_show(menuitem); gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", dupstr(sesslist.sessions[i])); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(saved_session_menuitem), inst); gtk_signal_connect(GTK_OBJECT(menuitem), "destroy", GTK_SIGNAL_FUNC(saved_session_freedata), inst); } get_sesslist(&sesslist, FALSE); / free up / } void update_specials_menu(void frontend) { struct gui_data inst = (struct gui_data )frontend; const struct telnet_special *specials;
︙			︙
3501 3502 3503 3504 3505 3506 3507 ~~3508 3509 3510~~ 3511 ~~3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529~~ 3530 3531 3532 3533 3534 3535 3536	if (new_session) MKMENUITEM("New Session", new_session_menuitem); MKMENUITEM("Restart Session", restart_session_menuitem); inst->restartitem = menuitem; gtk_widget_hide(inst->restartitem); MKMENUITEM("Duplicate Session", dup_session_menuitem); if (saved_sessions) { ~~struct sesslist sesslist;~~ ~~int i;~~ inst->sessionsmenu = gtk_menu_new(); ~~get_sesslist(&sesslist, TRUE);~~ ~~for (i = 1; i < sesslist.nsessions; i++) {~~ ~~menuitem = gtk_menu_item_new_with_label(sesslist.sessions[i]);~~ ~~gtk_container_add(GTK_CONTAINER(inst->sessionsmenu), menuitem);~~ ~~gtk_widget_show(menuitem);~~ ~~gtk_object_set_data(GTK_OBJECT(menuitem), "user-data",~~ ~~dupstr(sesslist.sessions[i]));~~ ~~gtk_signal_connect(GTK_OBJECT(menuitem), "activate",~~ ~~GTK_SIGNAL_FUNC(saved_session_menuitem),~~ ~~inst);~~ ~~gtk_signal_connect(GTK_OBJECT(menuitem), "destroy",~~ ~~GTK_SIGNAL_FUNC(saved_session_freedata),~~ ~~inst);~~ } ~~get_sesslist(&sesslist, FALSE);~~ MKMENUITEM("Saved Sessions", ~~NULL~~); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), inst->sessionsmenu); } MKMENUITEM(NULL, NULL); MKMENUITEM("Change Settings", change_settings_menuitem); MKMENUITEM(NULL, NULL); if (use_event_log)	< < < \| < < < < < < < < < < < < < < < \| \|	3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545	if (new_session) MKMENUITEM("New Session", new_session_menuitem); MKMENUITEM("Restart Session", restart_session_menuitem); inst->restartitem = menuitem; gtk_widget_hide(inst->restartitem); MKMENUITEM("Duplicate Session", dup_session_menuitem); if (saved_sessions) { inst->sessionsmenu = gtk_menu_new(); /* sessionsmenu will be updated when it's invoked / / XXX is this the right way to do dynamic menus in Gtk? */ MKMENUITEM("Saved Sessions", update_savedsess_menu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), inst->sessionsmenu); } MKMENUITEM(NULL, NULL); MKMENUITEM("Change Settings", change_settings_menuitem); MKMENUITEM(NULL, NULL); if (use_event_log)
︙			︙