Index: trunk/src/stub_draw.c
===================================================================
--- trunk/src/stub_draw.c	(revision 21365)
+++ trunk/src/stub_draw.c	(revision 21366)
@@ -93,10 +93,8 @@
 
 static pcb_text_t *dummy_fontsel_text = NULL;
 static pcb_layer_t *dummy_fontsel_layer = NULL;
-static int dummy_fontsel_type = 0;
 
 void (*pcb_stub_draw_fontsel)(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e) = dummy_draw_fontsel;
 pcb_bool (*pcb_stub_draw_fontsel_mouse_ev)(pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y) = dummy_mouse;
 pcb_text_t **pcb_stub_draw_fontsel_text_obj = &dummy_fontsel_text;
 pcb_layer_t **pcb_stub_draw_fontsel_layer_obj = &dummy_fontsel_layer;
-int *pcb_stub_draw_fontsel_text_type = &dummy_fontsel_type;
Index: trunk/src/stub_draw.h
===================================================================
--- trunk/src/stub_draw.h	(revision 21365)
+++ trunk/src/stub_draw.h	(revision 21366)
@@ -49,6 +49,5 @@
 extern pcb_bool (*pcb_stub_draw_fontsel_mouse_ev)(pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y);
 extern pcb_text_t **pcb_stub_draw_fontsel_text_obj;
 extern pcb_layer_t **pcb_stub_draw_fontsel_layer_obj;
-extern int *pcb_stub_draw_fontsel_text_type;
 
 #endif
Index: trunk/src_plugins/dialogs/dlg_fontsel.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 21365)
+++ trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 21366)
@@ -34,7 +34,6 @@
 
 	pcb_text_t *old_txt;
 	pcb_layer_t *old_layer;
-	int old_type;
 } fontsel_ctx_t;
 
 fontsel_ctx_t fontsel_ctx;
@@ -45,7 +44,6 @@
 
 	*pcb_stub_draw_fontsel_text_obj = ctx->old_txt;
 	*pcb_stub_draw_fontsel_layer_obj = ctx->old_layer;
-	*pcb_stub_draw_fontsel_text_type = ctx->old_type;
 
 	PCB_DAD_FREE(ctx->dlg);
 	memset(ctx, 0, sizeof(fontsel_ctx_t));
@@ -94,10 +92,8 @@
 
 	fontsel_ctx.old_txt = *pcb_stub_draw_fontsel_text_obj;
 	fontsel_ctx.old_layer = *pcb_stub_draw_fontsel_layer_obj;
-	fontsel_ctx.old_type = *pcb_stub_draw_fontsel_text_type;
 	*pcb_stub_draw_fontsel_text_obj = NULL;
 	*pcb_stub_draw_fontsel_layer_obj = NULL;
-	*pcb_stub_draw_fontsel_text_type = 0;
 
 	if (op != NULL) {
 		if (pcb_strcasecmp(op, "Object") == 0) {
@@ -108,7 +104,6 @@
 			if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
 				*pcb_stub_draw_fontsel_text_obj = ptr2;
 				*pcb_stub_draw_fontsel_layer_obj = ptr1;
-				*pcb_stub_draw_fontsel_text_type = type;
 			}
 		}
 		else
Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c
===================================================================
--- trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 21365)
+++ trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 21366)
@@ -104,7 +104,6 @@
 
 pcb_text_t *fontsel_txt = NULL;
 pcb_layer_t *fontsel_layer = NULL;
-int fontsel_txt_type = 0;
 
 static void pcb_draw_font(pcb_hid_gc_t gc, pcb_font_t *f, int x, int *y)
 {
@@ -203,7 +202,7 @@
 					conf_set(CFR_DESIGN, "design/text_font_id", 0, sval, POL_OVERWRITE);
 				}
 				else {
-					switch(fontsel_txt_type) {
+					switch(fontsel_txt->type) {
 						case PCB_OBJ_TEXT:
 							pcb_text_set_font(fontsel_layer, fontsel_txt, fid);
 							break;
@@ -248,7 +247,6 @@
 	pcb_stub_draw_fontsel_mouse_ev = pcb_mouse_fontsel;
 	pcb_stub_draw_fontsel_text_obj = &fontsel_txt;
 	pcb_stub_draw_fontsel_layer_obj = &fontsel_layer;
-	pcb_stub_draw_fontsel_text_type = &fontsel_txt_type;
 
 	return 0;
 }