Index: cam_gui.c
===================================================================
--- cam_gui.c	(revision 26939)
+++ cam_gui.c	(revision 26940)
@@ -74,7 +74,7 @@
 	/* restore cursor */
 	if (cursor_path != NULL) {
 		pcb_hid_attr_val_t hv;
-		hv.str_value = cursor_path;
+		hv.str = cursor_path;
 		pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wjobs, &hv);
 	}
 }
@@ -136,8 +136,8 @@
 	pcb_hid_row_t *r;
 	char *cell[3], *cursor_path = NULL;
 
-	cam_parse_opt_outfile(&ctx->cam, ctx->dlg[ctx->woutfile].val.str_value);
-	hv.str_value = ctx->cam.prefix == NULL ? "" : ctx->cam.prefix;
+	cam_parse_opt_outfile(&ctx->cam, ctx->dlg[ctx->woutfile].val.str);
+	hv.str = ctx->cam.prefix == NULL ? "" : ctx->cam.prefix;
 	pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wprefix, &hv);
 
 	attr = &ctx->dlg[ctx->wopts];
@@ -162,7 +162,7 @@
 	/* restore cursor */
 	if (cursor_path != NULL) {
 		pcb_hid_attr_val_t hv;
-		hv.str_value = cursor_path;
+		hv.str = cursor_path;
 		pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wopts, &hv);
 	}
 }
@@ -182,7 +182,7 @@
 
 	attr = &ctx->dlg[ctx->wjobs];
 	tree = (pcb_hid_tree_t *)attr->enumerations;
-	text = attr_inp->val.str_value;
+	text = attr_inp->val.str;
 
 	pcb_dad_tree_hide_all(tree, &tree->rows, 1);
 	pcb_dad_tree_unhide_filter(tree, &tree->rows, 0, text);
@@ -196,7 +196,7 @@
 	pcb_hid_row_t *row = pcb_dad_tree_get_selected(attr);
 
 	if (row != NULL) {
-		const char *outfile = ctx->dlg[ctx->woutfile].val.str_value;
+		const char *outfile = ctx->dlg[ctx->woutfile].val.str;
 		char *tmp = pcb_strdup_printf("outfile=%s", outfile);
 		pcb_actionl("cam", "call", row->cell[0], tmp, NULL);
 		free(tmp);
@@ -339,9 +339,9 @@
 
 	{ /* set default outfile */
 		pcb_hid_attr_val_t hv;
-		hv.str_value = pcb_derive_default_filename_(PCB->hidlib.filename, "");
+		hv.str = pcb_derive_default_filename_(PCB->hidlib.filename, "");
 		pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->woutfile, &hv);
-		free((char *)hv.str_value);
+		free((char *)hv.str);
 		cam_gui_opts2dlg(ctx);
 	}