Index: trunk/src/brave.c
===================================================================
--- trunk/src/brave.c	(revision 26977)
+++ trunk/src/brave.c	(revision 26978)
@@ -285,17 +285,17 @@
 void pcb_brave_init(void)
 {
 	conf_native_t *n = pcb_conf_get_field("rc/brave");
-	brave_conf_id = conf_hid_reg(brave_cookie, NULL);
+	brave_conf_id = pcb_conf_hid_reg(brave_cookie, NULL);
 
 	if (n != NULL) {
 		static conf_hid_callbacks_t cbs;
 		memset(&cbs, 0, sizeof(conf_hid_callbacks_t));
 		cbs.val_change_post = brave_conf_chg;
-		conf_hid_set_cb(n, brave_conf_id, &cbs);
+		pcb_conf_hid_set_cb(n, brave_conf_id, &cbs);
 	}
 }
 
 void pcb_brave_uninit(void)
 {
-	conf_hid_unreg(brave_cookie);
+	pcb_conf_hid_unreg(brave_cookie);
 }
Index: trunk/src/conf.c
===================================================================
--- trunk/src/conf.c	(revision 26977)
+++ trunk/src/conf.c	(revision 26978)
@@ -86,7 +86,7 @@
 0, 0, 0, 0, 0, 0, 0, 0, 0 /* make sure the array is addressable until CFR_max_alloc */
 };
 
-extern const char *conf_internal;
+extern const char *pcb_conf_internal;
 
 
 static lht_node_t *conf_lht_get_confroot(lht_node_t *cwd)
@@ -1175,7 +1175,7 @@
 
 	/* the ultimate fallback: all essential values are built in the executable
 	   on a low priority */
-	pcb_conf_load_as(CFR_INTERNAL, conf_internal, 1);
+	pcb_conf_load_as(CFR_INTERNAL, pcb_conf_internal, 1);
 
 	/* load config files */
 	pcb_conf_load_as(CFR_SYSTEM, pcbhl_conf_sys_path, 0);
@@ -2080,7 +2080,7 @@
 			fprintf(stderr, "pcb-rnd conf ERROR: conf node '%s' is not unregistered\n", e->key);
 	}
 
-	conf_pcb_hid_uninit();
+	pcb_conf_pcb_hid_uninit();
 
 	for(n = 0; n < CFR_max_alloc; n++) {
 		if (pcb_conf_main_root[n] != NULL)
Index: trunk/src/conf_hid.c
===================================================================
--- trunk/src/conf_hid.c	(revision 26977)
+++ trunk/src/conf_hid.c	(revision 26978)
@@ -10,7 +10,7 @@
 	conf_hid_id_t id;
 } conf_hid_t;
 
-void *conf_hid_set_data(conf_native_t *cfg, conf_hid_id_t id, void *data)
+void *pcb_conf_hid_set_data(conf_native_t *cfg, conf_hid_id_t id, void *data)
 {
 	void **old = vtp0_get(&cfg->hid_data, id, 0);
 	vtp0_set(&cfg->hid_data, id, data);
@@ -17,13 +17,13 @@
 	return old == NULL ? NULL : *old;
 }
 
-void *conf_hid_get_data(conf_native_t *cfg, conf_hid_id_t id)
+void *pcb_conf_hid_get_data(conf_native_t *cfg, conf_hid_id_t id)
 {
 	void **old = vtp0_get(&cfg->hid_data, id, 0);
 	return old == NULL ? NULL : *old;
 }
 
-const conf_hid_callbacks_t *conf_hid_set_cb(conf_native_t *cfg, conf_hid_id_t id, const conf_hid_callbacks_t *cbs)
+const conf_hid_callbacks_t *pcb_conf_hid_set_cb(conf_native_t *cfg, conf_hid_id_t id, const conf_hid_callbacks_t *cbs)
 {
 	void **old;
 	assert(id >= 0);
@@ -42,7 +42,7 @@
 		conf_hid_ids = htpp_alloc(ptrhash, ptrkeyeq);
 }
 
-void conf_pcb_hid_uninit(void)
+void pcb_conf_pcb_hid_uninit(void)
 {
 #ifndef NDEBUG
 	if (conf_hid_ids != NULL) {
@@ -58,7 +58,7 @@
 	}
 }
 
-conf_hid_id_t conf_hid_reg(const char *cookie, const conf_hid_callbacks_t *cb)
+conf_hid_id_t pcb_conf_hid_reg(const char *cookie, const conf_hid_callbacks_t *cb)
 {
 	conf_hid_t *h;
 
@@ -76,7 +76,7 @@
 	return h->id;
 }
 
-void conf_hid_unreg(const char *cookie)
+void pcb_conf_hid_unreg(const char *cookie)
 {
 	htsp_entry_t *e;
 	conf_hid_t *h = htpp_pop(conf_hid_ids, (void *)cookie);
@@ -115,7 +115,7 @@
 }
 
 typedef void (*cb_t)(conf_native_t *cfg, int arr_idx);
-void conf_hid_global_cb_(conf_native_t *item, int arr_idx, int offs)
+void pcb_conf_hid_global_cb_(conf_native_t *item, int arr_idx, int offs)
 {
 	htpp_entry_t *e;
 	if (conf_hid_ids == NULL)
@@ -133,7 +133,7 @@
 }
 
 
-void conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup)
+void pcb_conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup)
 {
 	*tag = NULL;
 	*popup = 0;
Index: trunk/src/conf_hid.h
===================================================================
--- trunk/src/conf_hid.h	(revision 26977)
+++ trunk/src/conf_hid.h	(revision 26978)
@@ -12,7 +12,7 @@
 	/* Called when a new config item is added to the database; global-only */
 	void (*new_item_post)(conf_native_t *cfg, int arr_idx);
 
-	/* Called during conf_hid_unreg to get hid-data cleaned up */
+	/* Called during pcb_conf_hid_unreg to get hid-data cleaned up */
 	void (*unreg_item)(conf_native_t *cfg, int arr_idx);
 } conf_hid_callbacks_t;
 
@@ -19,13 +19,13 @@
 typedef int conf_hid_id_t;
 
 /* Set local hid data in a native item; returns the previous value set or NULL */
-void *conf_hid_set_data(conf_native_t *cfg, conf_hid_id_t id, void *data);
+void *pcb_conf_hid_set_data(conf_native_t *cfg, conf_hid_id_t id, void *data);
 
 /* Returns local hid data in a native item */
-void *conf_hid_get_data(conf_native_t *cfg, conf_hid_id_t id);
+void *pcb_conf_hid_get_data(conf_native_t *cfg, conf_hid_id_t id);
 
 /* Set local callbacks in a native item; returns the previous callbacks set or NULL */
-const conf_hid_callbacks_t *conf_hid_set_cb(conf_native_t *cfg, conf_hid_id_t id, const conf_hid_callbacks_t *cbs);
+const conf_hid_callbacks_t *pcb_conf_hid_set_cb(conf_native_t *cfg, conf_hid_id_t id, const conf_hid_callbacks_t *cbs);
 
 
 /* register a hid with a cookie; this is necessary only if:
@@ -36,12 +36,12 @@
    cb holds the global notification callbacks - called when anything changed; it can be NULL.
    Returns a new HID id that can be used to access hid data, or -1 on error.
 */
-conf_hid_id_t conf_hid_reg(const char *cookie, const conf_hid_callbacks_t *cb);
+conf_hid_id_t pcb_conf_hid_reg(const char *cookie, const conf_hid_callbacks_t *cb);
 
 /* Unregister a hid; if unreg_item cb is specified, call it on each config item */
-void conf_hid_unreg(const char *cookie);
+void pcb_conf_hid_unreg(const char *cookie);
 
-void conf_pcb_hid_uninit(void);
+void pcb_conf_pcb_hid_uninit(void);
 
 
 /* Call the local callback of a native item */
@@ -60,15 +60,15 @@
 do { \
 	conf_hid_callbacks_t __cbs__; \
 	int __offs__ = ((char *)&(__cbs__.cb)) - ((char *)&(__cbs__)); \
-	conf_hid_global_cb_(native, arr_idx, __offs__); \
+	pcb_conf_hid_global_cb_(native, arr_idx, __offs__); \
 } while(0)
 
 /****** Utility/helper functions  ******/
 /* Looking at the log level, return a log format tag and whether the window
    should pop up. */
-void conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup);
+void pcb_conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup);
 
 /****** Internal  ******/
-void conf_hid_global_cb_(conf_native_t *item, int arr_idx, int offs);
+void pcb_conf_hid_global_cb_(conf_native_t *item, int arr_idx, int offs);
 
 #endif
Index: trunk/src/layer_vis.c
===================================================================
--- trunk/src/layer_vis.c	(revision 26977)
+++ trunk/src/layer_vis.c	(revision 26978)
@@ -349,12 +349,12 @@
 	conf_native_t *n_mask = pcb_conf_get_field("editor/show_mask");
 	static conf_hid_callbacks_t cbs_mask;
 
-	layer_vis_conf_id = conf_hid_reg(layer_vis_cookie, NULL);
+	layer_vis_conf_id = pcb_conf_hid_reg(layer_vis_cookie, NULL);
 
 	if (n_mask != NULL) {
 		memset(&cbs_mask, 0, sizeof(conf_hid_callbacks_t));
 		cbs_mask.val_change_post = layer_vis_chg_mask;
-		conf_hid_set_cb(n_mask, layer_vis_conf_id, &cbs_mask);
+		pcb_conf_hid_set_cb(n_mask, layer_vis_conf_id, &cbs_mask);
 	}
 
 	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, layer_vis_grp_defaults, NULL, layer_vis_cookie);
@@ -364,5 +364,5 @@
 void pcb_layer_vis_uninit(void)
 {
 	pcb_event_unbind_allcookie(layer_vis_cookie);
-	conf_hid_unreg(layer_vis_cookie);
+	pcb_conf_hid_unreg(layer_vis_cookie);
 }
Index: trunk/src_plugins/ddraft/ddraft.c
===================================================================
--- trunk/src_plugins/ddraft/ddraft.c	(revision 26977)
+++ trunk/src_plugins/ddraft/ddraft.c	(revision 26978)
@@ -470,7 +470,7 @@
 
 void pplg_uninit_ddraft(void)
 {
-	conf_hid_unreg(ddraft_cookie);
+	pcb_conf_hid_unreg(ddraft_cookie);
 	pcb_event_unbind_allcookie(ddraft_cookie);
 	pcb_remove_actions_by_cookie(ddraft_cookie);
 	pcb_tool_unreg_by_cookie(ddraft_cookie);
@@ -494,10 +494,10 @@
 	pcb_ddraft_tool = pcb_tool_lookup(tool_ddraft.name);
 
 
-	confid = conf_hid_reg(ddraft_cookie, NULL);
+	confid = pcb_conf_hid_reg(ddraft_cookie, NULL);
 	cn = pcb_conf_get_field("editor/all_direction_lines");
-	conf_hid_set_cb(cn, confid, &conf_cbs_adl);
+	pcb_conf_hid_set_cb(cn, confid, &conf_cbs_adl);
 	cn = pcb_conf_get_field("editor/mode");
-	conf_hid_set_cb(cn, confid, &conf_cbs_mode);
+	pcb_conf_hid_set_cb(cn, confid, &conf_cbs_mode);
 	return 0;
 }
Index: trunk/src_plugins/dialogs/dlg_pref.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref.c	(revision 26977)
+++ trunk/src_plugins/dialogs/dlg_pref.c	(revision 26978)
@@ -183,8 +183,8 @@
 			return;
 	}
 
-	item->cnext = conf_hid_get_data(cn, pref_hid);
-	conf_hid_set_data(cn, pref_hid, item);
+	item->cnext = pcb_conf_hid_get_data(cn, pref_hid);
+	pcb_conf_hid_set_data(cn, pref_hid, item);
 }
 
 void pcb_pref_create_conftable(pref_ctx_t *ctx, pref_confitem_t *list, void (*change_cb)(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr))
@@ -201,7 +201,7 @@
 		conf_native_t *cn = pcb_conf_get_field(c->confpath);
 		c->cnext = NULL;
 		if (cn != NULL)
-			conf_hid_set_data(cn, pref_hid, NULL);
+			pcb_conf_hid_set_data(cn, pref_hid, NULL);
 	}
 }
 
@@ -358,7 +358,7 @@
 {
 	pref_confitem_t *i;
 
-	for(i = conf_hid_get_data(cfg, pref_hid); i != NULL; i = i->cnext)
+	for(i = pcb_conf_hid_get_data(cfg, pref_hid); i != NULL; i = i->cnext)
 		if (i != pref_ctx.pcb_conf_lock)
 			pcb_pref_conf2dlg_item(cfg, i);
 
@@ -371,7 +371,7 @@
 	pref_conf_cb.val_change_post = pref_conf_changed;
 	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, pref_ev_board_changed, &pref_ctx, pref_cookie);
 	pcb_event_bind(PCB_EVENT_BOARD_META_CHANGED, pref_ev_board_meta_changed, &pref_ctx, pref_cookie);
-	pref_hid = conf_hid_reg(pref_cookie, &pref_conf_cb);
+	pref_hid = pcb_conf_hid_reg(pref_cookie, &pref_conf_cb);
 	pcb_dlg_pref_sizes_init(&pref_ctx);
 	pcb_dlg_pref_lib_init(&pref_ctx);
 }
@@ -379,7 +379,7 @@
 void pcb_dlg_pref_uninit(void)
 {
 	pcb_event_unbind_allcookie(pref_cookie);
-	conf_hid_unreg(pref_cookie);
+	pcb_conf_hid_unreg(pref_cookie);
 }
 
 const char pcb_acts_Preferences[] = "Preferences([tabname])\n";
Index: trunk/src_plugins/dialogs/dlg_pref_lib.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_lib.c	(revision 26977)
+++ trunk/src_plugins/dialogs/dlg_pref_lib.c	(revision 26978)
@@ -452,6 +452,6 @@
 		memset(&cbs_spth, 0, sizeof(conf_hid_callbacks_t));
 		cbs_spth.val_change_pre = pref_lib_conf2dlg_pre;
 		cbs_spth.val_change_post = pref_lib_conf2dlg_post;
-		conf_hid_set_cb(cn, pref_hid, &cbs_spth);
+		pcb_conf_hid_set_cb(cn, pref_hid, &cbs_spth);
 	}
 }
Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_sizes.c	(revision 26977)
+++ trunk/src_plugins/dialogs/dlg_pref_sizes.c	(revision 26978)
@@ -140,6 +140,6 @@
 	if (cn != NULL) {
 		memset(&cbs_isle, 0, sizeof(conf_hid_callbacks_t));
 		cbs_isle.val_change_post = pref_isle_brd2dlg;
-		conf_hid_set_cb(cn, pref_hid, &cbs_isle);
+		pcb_conf_hid_set_cb(cn, pref_hid, &cbs_isle);
 	}
 }
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 26977)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 26978)
@@ -147,10 +147,10 @@
 	if (grd <= 0)
 		grd = 1;
 
-	if (Vz(grd) < conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px) {
-		if (!conf_hid_gtk.plugins.hid_gtk.global_grid.sparse)
+	if (Vz(grd) < pcb_conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px) {
+		if (!pcb_conf_hid_gtk.plugins.hid_gtk.global_grid.sparse)
 			return;
-		grd *= (conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px / Vz(grd));
+		grd *= (pcb_conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px / Vz(grd));
 	}
 
 	if (x1 > x2) {
@@ -260,7 +260,7 @@
 		grid_local_have_old = 0;
 	}
 
-	if (!conf_hid_gtk.plugins.hid_gtk.local_grid.enable)
+	if (!pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.enable)
 		return;
 
 	if ((Vz(hidlib->grid) < PCB_MIN_GRID_DISTANCE) || (!pcbhl_conf.editor.draw_grid))
@@ -271,10 +271,10 @@
 	cy = (cy / hidlib->grid) * hidlib->grid + hidlib->grid_oy;
 
 	grid_local_have_old = 1;
-	ghid_gdk_draw_grid_local_(hidlib, cx, cy, conf_hid_gtk.plugins.hid_gtk.local_grid.radius);
+	ghid_gdk_draw_grid_local_(hidlib, cx, cy, pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.radius);
 	grid_local_old_x = cx;
 	grid_local_old_y = cy;
-	grid_local_old_r = conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
+	grid_local_old_r = pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
 }
 
 static void ghid_gdk_draw_grid(pcb_hidlib_t *hidlib)
@@ -303,7 +303,7 @@
 		set_clip(priv, priv->grid_gc);
 	}
 
-	if (conf_hid_gtk.plugins.hid_gtk.local_grid.enable) {
+	if (pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.enable) {
 		ghid_gdk_draw_grid_local(hidlib, grid_local_old_x, grid_local_old_y);
 		return;
 	}
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 26977)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 26978)
@@ -183,7 +183,7 @@
 	/* cx and cy are the actual cursor snapped to wherever - round them to the nearest real grid point */
 	grid_local_x = (cx / hidlib->grid) * hidlib->grid + hidlib->grid_ox;
 	grid_local_y = (cy / hidlib->grid) * hidlib->grid + hidlib->grid_oy;
-	grid_local_radius = conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
+	grid_local_radius = pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
 }
 
 static void ghid_gl_draw_grid(pcb_hidlib_t *hidlib, pcb_box_t *drawn_area)
@@ -198,7 +198,7 @@
 
 	glColor3f(priv->grid_color.red / 65535., priv->grid_color.green / 65535., priv->grid_color.blue / 65535.);
 
-	if (conf_hid_gtk.plugins.hid_gtk.local_grid.enable)
+	if (pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.enable)
 		hidgl_draw_local_grid(hidlib, grid_local_x, grid_local_y, grid_local_radius);
 	else
 		hidgl_draw_grid(hidlib, drawn_area);
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c	(revision 26977)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c	(revision 26978)
@@ -29,7 +29,7 @@
 void pplg_uninit_hid_gtk2_gl(void)
 {
 	pcb_event_unbind_allcookie(ghid_gl_cookie);
-	conf_hid_unreg(ghid_gl_cookie);
+	pcb_conf_hid_unreg(ghid_gl_cookie);
 	drawgl_uninit();
 }
 
Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c
===================================================================
--- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 26977)
+++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 26978)
@@ -268,10 +268,10 @@
 
 	grd = hidlib->grid;
 
-	if (Vz(grd) < conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px) {
-		if (!conf_hid_gtk.plugins.hid_gtk.global_grid.sparse)
+	if (Vz(grd) < pcb_conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px) {
+		if (!pcb_conf_hid_gtk.plugins.hid_gtk.global_grid.sparse)
 			return;
-		grd *= (conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px / Vz(grd));
+		grd *= (pcb_conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px / Vz(grd));
 	}
 
 	if (x1 > x2) {
@@ -399,7 +399,7 @@
 		grid_local_have_old = 0;
 	}
 
-	if (!conf_hid_gtk.plugins.hid_gtk.local_grid.enable)
+	if (!pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.enable)
 		return;
 
 	if ((Vz(hidlib->grid) < PCB_MIN_GRID_DISTANCE) || (!pcbhl_conf.editor.draw_grid))
@@ -410,10 +410,10 @@
 	cy = (cy / hidlib->grid) * hidlib->grid + hidlib->grid_oy;
 
 	grid_local_have_old = 1;
-	ghid_cairo_draw_grid_local_(hidlib, cx, cy, conf_hid_gtk.plugins.hid_gtk.local_grid.radius);
+	ghid_cairo_draw_grid_local_(hidlib, cx, cy, pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.radius);
 	grid_local_old_x = cx;
 	grid_local_old_y = cy;
-	grid_local_old_r = conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
+	grid_local_old_r = pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
 }
 
 static void ghid_cairo_draw_grid(pcb_hidlib_t *hidlib)
@@ -448,7 +448,7 @@
 	cairo_set_line_width(cr, 1.0);
 	gdk_cairo_set_source_rgba(cr, &priv->grid_color);
 
-	if (conf_hid_gtk.plugins.hid_gtk.local_grid.enable) {
+	if (pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.enable) {
 		ghid_cairo_draw_grid_local(hidlib, grid_local_old_x, grid_local_old_y);
 		cairo_restore(cr);
 		return;
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 26977)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 26978)
@@ -2876,7 +2876,7 @@
 	if (n != NULL) {
 		memset(cbs, 0, sizeof(conf_hid_callbacks_t));
 		cbs->val_change_post = func;
-		conf_hid_set_cb(n, lesstif_conf_id, cbs);
+		pcb_conf_hid_set_cb(n, lesstif_conf_id, cbs);
 	}
 }
 
@@ -3027,7 +3027,7 @@
 {
 	pcb_export_remove_opts_by_cookie(lesstif_cookie);
 	pcb_event_unbind_allcookie(lesstif_cookie);
-	conf_hid_unreg(lesstif_cookie);
+	pcb_conf_hid_unreg(lesstif_cookie);
 }
 
 int pplg_init_hid_lesstif(void)
@@ -3139,7 +3139,7 @@
 
 	pcb_hid_register_hid(&lesstif_hid);
 	if (lesstif_conf_id < 0)
-		lesstif_conf_id = conf_hid_reg(lesstif_cookie, &ccb);
+		lesstif_conf_id = pcb_conf_hid_reg(lesstif_cookie, &ccb);
 /*	lesstif_conf_regs(lesstif_cookie);*/
 
 	return 0;
Index: trunk/src_plugins/hid_lesstif/menu.c
===================================================================
--- trunk/src_plugins/hid_lesstif/menu.c	(revision 26977)
+++ trunk/src_plugins/hid_lesstif/menu.c	(revision 26978)
@@ -497,7 +497,7 @@
 						cbs.val_change_post = lesstif_confchg_checkbox;
 						cbs_inited = 1;
 					}
-					conf_hid_set_cb(nat, lesstif_menuconf_id, &cbs);
+					pcb_conf_hid_set_cb(nat, lesstif_menuconf_id, &cbs);
 				}
 				else {
 					if (*uo != '\0')
@@ -665,12 +665,12 @@
 void lesstif_init_menu(void)
 {
 	if (lesstif_menuconf_id < 0)
-		lesstif_menuconf_id = conf_hid_reg(lesstif_menu_cookie, NULL);
+		lesstif_menuconf_id = pcb_conf_hid_reg(lesstif_menu_cookie, NULL);
 }
 
 void lesstif_uninit_menu(void)
 {
-	conf_hid_unreg(lesstif_menu_cookie);
+	pcb_conf_hid_unreg(lesstif_menu_cookie);
 	XtDestroyWidget(lesstif_menubar);
 	lesstif_menuconf_id = -1;
 }
Index: trunk/src_plugins/lib_gtk_common/bu_menu.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/bu_menu.c	(revision 26977)
+++ trunk/src_plugins/lib_gtk_common/bu_menu.c	(revision 26978)
@@ -179,7 +179,7 @@
 					cbs.val_change_post = ctx->confchg_checkbox;
 					cbs_inited = 1;
 				}
-				conf_hid_set_cb(nat, ctx->ghid_menuconf_id, &cbs);
+				pcb_conf_hid_set_cb(nat, ctx->ghid_menuconf_id, &cbs);
 			}
 			else {
 				if ((update_on == NULL) || (*update_on != '\0'))
Index: trunk/src_plugins/lib_gtk_common/glue_common.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_common.c	(revision 26977)
+++ trunk/src_plugins/lib_gtk_common/glue_common.c	(revision 26978)
@@ -120,7 +120,7 @@
 	if (n != NULL) {
 		memset(cbs, 0, sizeof(conf_hid_callbacks_t));
 		cbs->val_change_post = func;
-		conf_hid_set_cb(n, ghidgui->conf_id, cbs);
+		pcb_conf_hid_set_cb(n, ghidgui->conf_id, cbs);
 	}
 }
 
@@ -128,7 +128,7 @@
 {
 	static conf_hid_callbacks_t cbs_fullscreen, cbs_cli[2], cbs_color[3];
 
-	ghidgui->conf_id = conf_hid_reg(cookie, NULL);
+	ghidgui->conf_id = pcb_conf_hid_reg(cookie, NULL);
 
 	init_conf_watch(&cbs_fullscreen, "editor/fullscreen", ghid_confchg_fullscreen);
 
@@ -139,7 +139,7 @@
 	init_conf_watch(&cbs_color[1], "appearance/color/off_limit", ghid_confchg_spec_color);
 	init_conf_watch(&cbs_color[2], "appearance/color/grid", ghid_confchg_spec_color);
 
-	ghidgui->topwin.menu.ghid_menuconf_id = conf_hid_reg(cookie_menu, NULL);
+	ghidgui->topwin.menu.ghid_menuconf_id = pcb_conf_hid_reg(cookie_menu, NULL);
 	ghidgui->topwin.menu.confchg_checkbox = ghid_confchg_checkbox;
 }
 
@@ -266,8 +266,8 @@
 {
 	GError *err = NULL;
 
-	if (conf_hid_gtk.plugins.hid_gtk.bg_image)
-		ghidgui->bg_pixbuf = gdk_pixbuf_new_from_file(conf_hid_gtk.plugins.hid_gtk.bg_image, &err);
+	if (pcb_conf_hid_gtk.plugins.hid_gtk.bg_image)
+		ghidgui->bg_pixbuf = gdk_pixbuf_new_from_file(pcb_conf_hid_gtk.plugins.hid_gtk.bg_image, &err);
 
 	if (err) {
 		g_error("%s", err->message);
@@ -315,8 +315,8 @@
 void ghid_glue_common_uninit(const char *cookie)
 {
 	pcb_event_unbind_allcookie(cookie);
-	conf_hid_unreg(cookie);
-	conf_hid_unreg(cookie_menu);
+	pcb_conf_hid_unreg(cookie);
+	pcb_conf_hid_unreg(cookie_menu);
 }
 
 void ghid_glue_common_init(const char *cookie)
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26977)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 26978)
@@ -164,7 +164,7 @@
 
 	pcb_gtk_interface_input_signals_connect();
 
-	if (conf_hid_gtk.plugins.hid_gtk.listen)
+	if (pcb_conf_hid_gtk.plugins.hid_gtk.listen)
 		pcb_gtk_create_listener();
 
 	gctx->gui_is_up = 1;
Index: trunk/src_plugins/lib_gtk_common/hid_gtk_conf.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/hid_gtk_conf.h	(revision 26977)
+++ trunk/src_plugins/lib_gtk_common/hid_gtk_conf.h	(revision 26978)
@@ -70,6 +70,6 @@
 	} plugins;
 } conf_hid_gtk_t;
 
-extern conf_hid_gtk_t conf_hid_gtk;
+extern conf_hid_gtk_t pcb_conf_hid_gtk;
 
 #endif
Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/lib_gtk_config.c	(revision 26977)
+++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.c	(revision 26978)
@@ -37,11 +37,11 @@
 static const char *lib_gtk_config_cookie = "lib_gtk_config";
 
 conf_hid_id_t ghid_conf_id = -1;
-conf_hid_gtk_t conf_hid_gtk;
+conf_hid_gtk_t pcb_conf_hid_gtk;
 
 void pcb_gtk_conf_uninit(void)
 {
-	conf_hid_unreg(lib_gtk_config_cookie);
+	pcb_conf_hid_unreg(lib_gtk_config_cookie);
 	pcb_conf_unreg_fields("plugins/hid_gtk/");
 }
 
@@ -97,10 +97,10 @@
 	int dirty[CFR_max_real] = {0};
 	conf_role_t r;
 
-	ghid_conf_id = conf_hid_reg(lib_gtk_config_cookie, NULL);
+	ghid_conf_id = pcb_conf_hid_reg(lib_gtk_config_cookie, NULL);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
-	pcb_conf_reg_field(conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags);
+	pcb_conf_reg_field(pcb_conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags);
 #include "../src_plugins/lib_gtk_common/hid_gtk_conf_fields.h"
 
 	/* check for legacy win geo settings */
Index: trunk/src_plugins/lib_hid_common/dlg_log.c
===================================================================
--- trunk/src_plugins/lib_hid_common/dlg_log.c	(revision 26977)
+++ trunk/src_plugins/lib_hid_common/dlg_log.c	(revision 26978)
@@ -58,7 +58,7 @@
 	const char *prefix = NULL;
 	int popup;
 
-	conf_loglevel_props(line->level, &prefix, &popup);
+	pcb_conf_loglevel_props(line->level, &prefix, &popup);
 
 	if (pcb_gui->supports_dad_text_markup) {
 		if (prefix != NULL) {
@@ -200,7 +200,7 @@
 		const char *prefix;
 		int popup;
 
-		conf_loglevel_props(line->level, &prefix, &popup);
+		pcb_conf_loglevel_props(line->level, &prefix, &popup);
 		if (popup)
 			log_window_create();
 	}
@@ -228,7 +228,7 @@
 		const char *prefix;
 		int popup;
 
-		conf_loglevel_props(n->level, &prefix, &popup);
+		pcb_conf_loglevel_props(n->level, &prefix, &popup);
 		if (popup) {
 			log_window_create();
 			return;
Index: trunk/src_plugins/lib_hid_common/lib_hid_common.c
===================================================================
--- trunk/src_plugins/lib_hid_common/lib_hid_common.c	(revision 26977)
+++ trunk/src_plugins/lib_hid_common/lib_hid_common.c	(revision 26978)
@@ -85,7 +85,7 @@
 	pcb_event_unbind_allcookie(grid_cookie);
 	pcb_event_unbind_allcookie(lead_cookie);
 	pcb_event_unbind_allcookie(wplc_cookie);
-	conf_hid_unreg(grid_cookie);
+	pcb_conf_hid_unreg(grid_cookie);
 	pcb_dialog_place_uninit();
 	pcb_remove_actions_by_cookie(hid_common_cookie);
 	pcb_act_dad_uninit();
@@ -120,19 +120,19 @@
 	pcb_event_bind(PCB_EVENT_DAD_NEW_DIALOG, pcb_dialog_place, NULL, wplc_cookie);
 	pcb_event_bind(PCB_EVENT_DAD_NEW_GEO, pcb_dialog_resize, NULL, wplc_cookie);
 
-	conf_id = conf_hid_reg(grid_cookie, NULL);
+	conf_id = pcb_conf_hid_reg(grid_cookie, NULL);
 
 	memset(&ccb, 0, sizeof(ccb));
 	ccb.val_change_post = pcb_grid_update_conf;
 	nat = pcb_conf_get_field("editor/grids");
 	if (nat != NULL)
-		conf_hid_set_cb(nat, conf_id, &ccb);
+		pcb_conf_hid_set_cb(nat, conf_id, &ccb);
 
 	memset(&ccbu, 0, sizeof(ccbu));
 	ccbu.val_change_post = grid_unit_chg_ev;
 	nat = pcb_conf_get_field("editor/grid_unit");
 	if (nat != NULL)
-		conf_hid_set_cb(nat, conf_id, &ccbu);
+		pcb_conf_hid_set_cb(nat, conf_id, &ccbu);
 
 	return 0;
 }
Index: trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c	(revision 26977)
+++ trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c	(revision 26978)
@@ -94,11 +94,11 @@
 	pcb_event_unbind_allcookie(infobar_cookie);
 	pcb_event_unbind_allcookie(title_cookie);
 	pcb_event_unbind_allcookie(layersel_cookie);
-	conf_hid_unreg(rst_cookie);
-	conf_hid_unreg(toolbar_cookie);
-	conf_hid_unreg(status_cookie);
-	conf_hid_unreg(status_rd_cookie);
-	conf_hid_unreg(infobar_cookie);
+	pcb_conf_hid_unreg(rst_cookie);
+	pcb_conf_hid_unreg(toolbar_cookie);
+	pcb_conf_hid_unreg(status_cookie);
+	pcb_conf_hid_unreg(status_rd_cookie);
+	pcb_conf_hid_unreg(infobar_cookie);
 }
 
 #include "dolists.h"
@@ -111,13 +111,13 @@
 	int n;
 	conf_hid_id_t conf_id;
 
-	conf_id = conf_hid_reg(cookie, NULL);
+	conf_id = pcb_conf_hid_reg(cookie, NULL);
 	for(rp = paths, n = 0; *rp != NULL; rp++, n++) {
 		memset(&cb[n], 0, sizeof(cb[0]));
 		cb[n].val_change_post = update_cb;
 		nat = pcb_conf_get_field(*rp);
 		if (nat != NULL)
-			conf_hid_set_cb(nat, conf_id, &cb[n]);
+			pcb_conf_hid_set_cb(nat, conf_id, &cb[n]);
 	}
 
 	return conf_id;
Index: trunk/src_plugins/propedit/propdlg.c
===================================================================
--- trunk/src_plugins/propedit/propdlg.c	(revision 26977)
+++ trunk/src_plugins/propedit/propdlg.c	(revision 26978)
@@ -666,15 +666,15 @@
 {
 	static conf_hid_callbacks_t cbs;
 	conf_native_t *n = pcb_conf_get_field("editor/grid_unit");
-	propdlg_conf_id = conf_hid_reg(propdlg_cookie, NULL);
+	propdlg_conf_id = pcb_conf_hid_reg(propdlg_cookie, NULL);
 
 	if (n != NULL) {
 		cbs.val_change_post = propdlg_unit_change;
-		conf_hid_set_cb(n, propdlg_conf_id, &cbs);
+		pcb_conf_hid_set_cb(n, propdlg_conf_id, &cbs);
 	}
 }
 
 void pcb_propdlg_uninit(void)
 {
-	conf_hid_unreg(propdlg_cookie);
+	pcb_conf_hid_unreg(propdlg_cookie);
 }
Index: trunk/tests/conf/conftest.c
===================================================================
--- trunk/tests/conf/conftest.c	(revision 26977)
+++ trunk/tests/conf/conftest.c	(revision 26978)
@@ -276,7 +276,7 @@
 		pcb_message(PCB_MSG_ERROR, "unknown path");
 		return;
 	}
-	conf_hid_set_cb(n, hid_id, (add ? &watch_cbs : NULL));
+	pcb_conf_hid_set_cb(n, hid_id, (add ? &watch_cbs : NULL));
 }
 
 void cmd_notify(char *arg)
@@ -361,7 +361,7 @@
 int main()
 {
 
-	hid_id = conf_hid_reg(hid_cookie, &global_cbs);
+	hid_id = pcb_conf_hid_reg(hid_cookie, &global_cbs);
 
 	pcb_conf_init();
 	conf_core_init();
@@ -415,7 +415,7 @@
 			pcb_message(PCB_MSG_ERROR, "unknown command '%s'", cmd);
 	}
 
-	conf_hid_unreg(hid_cookie);
+	pcb_conf_hid_unreg(hid_cookie);
 	pcb_conf_uninit();
 	return 0;
 }