--- np2/x11/gtk/Attic/gtk_menu.c	2003/12/11 15:11:56	1.1
+++ np2/x11/gtk/Attic/gtk_menu.c	2004/02/05 16:38:05	1.3
@@ -231,8 +231,6 @@ static GtkItemFactoryEntry menu_items[] 
 { "/HardDisk/SASI-_2",		NULL, NULL, 0, "<Branch>" },
 { "/HardDisk/SASI-2/_Open...",	NULL, f(sasiopen), 1, NULL },
 { "/HardDisk/SASI-2/_Remove",	NULL, f(sasiremove), 1, NULL },
-{ "/HardDisk/sep1",		NULL, NULL, 0, "<Separator>" },
-{ "/HardDisk/_Remove All",	NULL, f(sasiremove), ~0, NULL },
 { "/Screen",			NULL, NULL, 0, "<Branch>" },
 { "/Screen/_Window",		NULL, NULL, 0, "<RadioItem>" },
 { "/Screen/_FullScreen",	NULL, NULL, 0, "/Screen/Window" },
@@ -385,7 +383,7 @@ create_menu(GtkWidget *w)
 	xmenu_toggle_item(KEY_DISPLAY, np2oscfg.keydisp, TRUE);
 
 	xmenu_select_framerate(np2oscfg.DRAW_SKIP);
-	xmenu_select_f12key(np2oscfg.F12COPY);
+	xmenu_select_f12key(np2oscfg.F12KEY);
 	xmenu_select_beepvol(np2cfg.BEEP_VOL);
 	xmenu_select_soundboard(np2cfg.SOUND_SW);
 	xmenu_select_extmem(np2cfg.EXTMEM);
@@ -914,9 +912,9 @@ f12(gpointer data, guint action, GtkWidg
 	if (action >= 5)
 		action = 0;
 
-	if (np2oscfg.F12COPY != action) {
-		np2oscfg.F12COPY = action;
-		gtkkbd_resetf12();
+	if (np2oscfg.F12KEY != action) {
+		np2oscfg.F12KEY = action;
+		kbdmng_resetf12();
 		sysmng_update(SYS_UPDATEOSCFG);
 	}
 }
@@ -929,6 +927,7 @@ beepvol(gpointer data, guint action, Gtk
 	UNUSED(w);
 
 	if (np2cfg.BEEP_VOL != action) {
+		np2cfg.BEEP_VOL = action;
 		beep_setvol(action);
 		sysmng_update(SYS_UPDATECFG);
 	}