Index: font_act.c
===================================================================
--- font_act.c	(revision 36697)
+++ font_act.c	(revision 36698)
@@ -43,7 +43,7 @@
 	const char *fname = NULL, *sid = NULL;
 	static char *default_file = NULL;
 	rnd_font_id_t fid, dst_fid = -1;
-	pcb_font_t *fnt;
+	rnd_font_t *fnt;
 	int r;
 
 	RND_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str);
@@ -94,18 +94,18 @@
 	}
 	
 	r = pcb_parse_font(fnt, fname);
-	rnd_event(RND_ACT_HIDLIB, PCB_EVENT_FONT_CHANGED, "i", fnt->rnd_font.id);
+	rnd_event(RND_ACT_HIDLIB, PCB_EVENT_FONT_CHANGED, "i", fnt->id);
 	if (r != 0) {
 		rnd_message(RND_MSG_ERROR, "LoadFontFrom(): failed to load font from %s\n", fname);
-		pcb_del_font(&PCB_ACT_BOARD->fontkit, fnt->rnd_font.id);
+		pcb_del_font(&PCB_ACT_BOARD->fontkit, fnt->id);
 		return 1;
 	}
 	
 	if (dst_fid != -1) {
-		pcb_move_font(&PCB_ACT_BOARD->fontkit, fnt->rnd_font.id, dst_fid);
+		pcb_move_font(&PCB_ACT_BOARD->fontkit, fnt->id, dst_fid);
 	}
 	
-	fid = dst_fid == 0 ? 0 : fnt->rnd_font.id;
+	fid = dst_fid == 0 ? 0 : fnt->id;
 	rnd_message(RND_MSG_INFO, "LoadFontFrom(): new font (ID %d) successfully loaded from file %s\n", fid, fname);
 	RND_ACT_IRES(0);
 	return 0;