Index: gtkhid-cairo.c
===================================================================
--- gtkhid-cairo.c	(revision 26977)
+++ 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;