Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 15752)
+++ trunk/src/search.c	(revision 15753)
@@ -1106,18 +1106,8 @@
 		SearchBox = pcb_point_box(X, Y);
 	}
 
-#warning subc TODO: rewrite this for floaters
-#if 0
-	if (conf_core.editor.lock_names) {
-		Type &= ~(PCB_TYPE_ELEMENT_NAME | PCB_TYPE_TEXT);
-	}
-	if (conf_core.editor.hide_names) {
-		Type &= ~PCB_TYPE_ELEMENT_NAME;
-	}
-#endif
-
 	if (conf_core.editor.only_names) {
-		Type &= (/*PCB_TYPE_ELEMENT_NAME |*/ PCB_TYPE_TEXT);
+		Type &= PCB_TYPE_TEXT;
 	}
 
 	if (conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) {