Index: trunk/src/idpath.c
===================================================================
--- trunk/src/idpath.c	(revision 25861)
+++ trunk/src/idpath.c	(revision 25862)
@@ -156,7 +156,7 @@
 	}
 }
 
-pcb_any_obj_t *pcb_idpath2obj(pcb_data_t *data, const pcb_idpath_t *path)
+pcb_any_obj_t *pcb_idpath2obj_in(pcb_data_t *data, const pcb_idpath_t *path)
 {
 	return idpath2obj(data, path, 0);
 }
Index: trunk/src/idpath.h
===================================================================
--- trunk/src/idpath.h	(revision 25861)
+++ trunk/src/idpath.h	(revision 25862)
@@ -59,7 +59,7 @@
 
 pcb_idpath_t *pcb_obj2idpath(pcb_any_obj_t *obj);
 pcb_idpath_t *pcb_str2idpath(const char *str); /* slash separated list of ids */
-pcb_any_obj_t *pcb_idpath2obj(pcb_data_t *data, const pcb_idpath_t *path);
+pcb_any_obj_t *pcb_idpath2obj_in(pcb_data_t *data, const pcb_idpath_t *path);
 pcb_idpath_t *pcb_idpath_dup(const pcb_idpath_t *path);
 void pcb_idpath_destroy(pcb_idpath_t *path);
 
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 25861)
+++ trunk/src/obj_rat.c	(revision 25862)
@@ -306,7 +306,7 @@
 
 	/* (relatively) cheap thest if existing anchor is valid */
 	if (*path != NULL) {
-		ao = pcb_idpath2obj(data, *path);
+		ao = pcb_idpath2obj_in(data, *path);
 		switch(ao->type) {
 			case PCB_OBJ_LINE: if (rat_meets_line((pcb_line_t *)ao, x, y, gid)) return ao; break;
 			case PCB_OBJ_ARC:  if (rat_meets_arc((pcb_arc_t *)ao, x, y, gid)) return ao; break;
Index: trunk/src/view.c
===================================================================
--- trunk/src/view.c	(revision 25861)
+++ trunk/src/view.c	(revision 25862)
@@ -171,7 +171,7 @@
 	/* special case: single objet in group A, use the center */
 	if (pcb_idpath_list_length(&v->objs[0]) == 1) {
 		idp = pcb_idpath_list_first(&v->objs[0]);
-		obj = pcb_idpath2obj(data, idp);
+		obj = pcb_idpath2obj_in(data, idp);
 		if (obj != NULL) {
 			v->have_bbox = 1;
 			pcb_obj_center(obj, &v->x, &v->y);
@@ -185,7 +185,7 @@
 	b.X2 = b.Y2 = -PCB_MAX_COORD;
 	for(g = 0; g < 2; g++) {
 		for(idp = pcb_idpath_list_first(&v->objs[g]); idp != NULL; idp = pcb_idpath_list_next(idp)) {
-			obj = pcb_idpath2obj(data, idp);
+			obj = pcb_idpath2obj_in(data, idp);
 			if (obj != NULL) {
 				v->have_bbox = 1;
 				pcb_box_bump_box(&b, &obj->BoundingBox);
Index: trunk/src_plugins/act_read/act_idpath.c
===================================================================
--- trunk/src_plugins/act_read/act_idpath.c	(revision 25861)
+++ trunk/src_plugins/act_read/act_idpath.c	(revision 25862)
@@ -178,7 +178,7 @@
 	if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[iidx], PCB_PTR_DOMAIN_IDPATH))
 		return FGW_ERR_PTR_DOMAIN;
 
-	obj = pcb_idpath2obj(root_data, idp);
+	obj = pcb_idpath2obj_in(root_data, idp);
 	if (obj == NULL)
 		return 0;
 
Index: trunk/src_plugins/dialogs/dlg_fontsel.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 25861)
+++ trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 25862)
@@ -76,7 +76,7 @@
 	fontsel_ctx_t *ctx = prv->user_ctx;
 
 	if (ctx->txt_id != NULL) {
-		pcb_text_t *txt = (pcb_text_t *)pcb_idpath2obj(ctx->pcb->Data, ctx->txt_id);
+		pcb_text_t *txt = (pcb_text_t *)pcb_idpath2obj_in(ctx->pcb->Data, ctx->txt_id);
 		if (txt != NULL)
 			pcb_stub_draw_fontsel(gc, e, txt);
 		ctx->last_fobj = txt;
@@ -93,7 +93,7 @@
 	fontsel_ctx_t *ctx = prv->user_ctx;
 
 	if (ctx->txt_id != NULL) {
-		pcb_text_t *txt = (pcb_text_t *)pcb_idpath2obj(ctx->pcb->Data, ctx->txt_id);
+		pcb_text_t *txt = (pcb_text_t *)pcb_idpath2obj_in(ctx->pcb->Data, ctx->txt_id);
 		if (txt == NULL)
 			return 0;
 		return pcb_stub_draw_fontsel_mouse_ev(kind, x, y, txt);
@@ -157,7 +157,7 @@
 	}
 	else {
 		for(c = gdl_first(&fontsels); c != NULL; c = gdl_next(&fontsels, c)) {
-			pcb_text_t *txt = (pcb_text_t *)pcb_idpath2obj(c->pcb->Data, c->txt_id);
+			pcb_text_t *txt = (pcb_text_t *)pcb_idpath2obj_in(c->pcb->Data, c->txt_id);
 			if (txt == txt_obj) {
 				pcb_message(PCB_MSG_ERROR, "There is already an active fontedit dialog for that object,\nnot going to open a second dialog.\n");
 				return;
@@ -267,7 +267,7 @@
 		if (c->txt_id == NULL)
 			continue;
 
-		txt = (pcb_text_t *)pcb_idpath2obj(c->pcb->Data, c->txt_id);
+		txt = (pcb_text_t *)pcb_idpath2obj_in(c->pcb->Data, c->txt_id);
 		if ((txt != c->last_fobj) || (txt != NULL && (txt->fid != c->last_fid)))
 			fontsel_preview_update(c);
 	}
Index: trunk/src_plugins/dialogs/dlg_view.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_view.c	(revision 25861)
+++ trunk/src_plugins/dialogs/dlg_view.c	(revision 25862)
@@ -225,7 +225,7 @@
 	for(g = 0; g < 2; g++) {
 		pcb_idpath_t *i;
 		for(i = pcb_idpath_list_first(&v->objs[g]); i != NULL; i = pcb_idpath_list_next(i)) {
-			pcb_any_obj_t *obj = pcb_idpath2obj(ctx->pcb->Data, i);
+			pcb_any_obj_t *obj = pcb_idpath2obj_in(ctx->pcb->Data, i);
 			if ((obj != NULL) && (obj->type & PCB_OBJ_CLASS_REAL)) {
 				vtp0_append(&view_color_save, obj);
 				if (obj->override_color != NULL)
@@ -507,7 +507,7 @@
 		return;
 
 	for(i = pcb_idpath_list_first(&v->objs[0]); i != NULL; i = pcb_idpath_list_next(i)) {
-		pcb_any_obj_t *obj = pcb_idpath2obj(ctx->pcb->Data, i);
+		pcb_any_obj_t *obj = pcb_idpath2obj_in(ctx->pcb->Data, i);
 		if ((obj != NULL) && (obj->type & PCB_OBJ_CLASS_REAL)) {
 			pcb_undo_add_obj_to_flag((void *)obj);
 			pcb_draw_obj(obj);
Index: trunk/src_plugins/propedit/propdlg.c
===================================================================
--- trunk/src_plugins/propedit/propdlg.c	(revision 25861)
+++ trunk/src_plugins/propedit/propdlg.c	(revision 25862)
@@ -177,7 +177,7 @@
 
 		inv = 0;
 		for(idp = pcb_idpath_list_first(&ctx->pe.objs); idp != NULL; idp = pcb_idpath_list_next(idp)) {
-			pcb_any_obj_t *o = pcb_idpath2obj(ctx->pe.data, idp);
+			pcb_any_obj_t *o = pcb_idpath2obj_in(ctx->pe.data, idp);
 			if (o != NULL)
 				pcb_append_printf(&scope, "%s #%ld, ", pcb_obj_type_name(o->type), o->ID);
 			else
Index: trunk/src_plugins/propedit/propsel.c
===================================================================
--- trunk/src_plugins/propedit/propsel.c	(revision 25861)
+++ trunk/src_plugins/propedit/propsel.c	(revision 25862)
@@ -269,7 +269,7 @@
 		map_layergrp(ctx, pcb_get_layergrp(ctx->pcb, ctx->layergrps.array[n]));
 
 	for(idp = pcb_idpath_list_first(&ctx->objs); idp != NULL; idp = pcb_idpath_list_next(idp))
-		map_any(ctx, pcb_idpath2obj(ctx->data, idp));
+		map_any(ctx, pcb_idpath2obj_in(ctx->data, idp));
 
 	if (ctx->selection) {
 		pcb_any_obj_t *o;
@@ -614,7 +614,7 @@
 		set_layergrp(sctx, pcb_get_layergrp(ctx->pcb, ctx->layergrps.array[n]));
 
 	for(idp = pcb_idpath_list_first(&ctx->objs); idp != NULL; idp = pcb_idpath_list_next(idp))
-		set_any(sctx, pcb_idpath2obj(ctx->data, idp));
+		set_any(sctx, pcb_idpath2obj_in(ctx->data, idp));
 
 	if (ctx->selection) {
 		pcb_any_obj_t *o;
@@ -709,7 +709,7 @@
 		del_cnt += del_layergrp(ctx, pcb_get_layergrp(ctx->pcb, ctx->layergrps.array[n]), key);
 
 	for(idp = pcb_idpath_list_first(&ctx->objs); idp != NULL; idp = pcb_idpath_list_next(idp))
-		del_cnt += del_any(ctx, pcb_idpath2obj(ctx->data, idp), key);
+		del_cnt += del_any(ctx, pcb_idpath2obj_in(ctx->data, idp), key);
 
 	if (ctx->selection) {
 		pcb_any_obj_t *o;
Index: trunk/src_plugins/query/query_act.c
===================================================================
--- trunk/src_plugins/query/query_act.c	(revision 25861)
+++ trunk/src_plugins/query/query_act.c	(revision 25862)
@@ -359,7 +359,7 @@
 	}
 
 	obj.type = PCBQ_VT_OBJ;
-	obj.data.obj = pcb_idpath2obj(PCB->Data, idp);
+	obj.data.obj = pcb_idpath2obj_in(PCB->Data, idp);
 	if (obj.data.obj == NULL)
 		goto err;
 	if (pcb_qry_obj_field(&obj, fld, &val) != 0)