Index: trunk/src/hid_attrib.h
===================================================================
--- trunk/src/hid_attrib.h	(revision 26942)
+++ trunk/src/hid_attrib.h	(revision 26943)
@@ -14,7 +14,7 @@
 	const char *str;
 	double dbl;
 	pcb_coord_t crd;
-	pcb_color_t clr_value;
+	pcb_color_t clr;
 	void (*func)();
 };
 
Index: trunk/src/hid_dad.h
===================================================================
--- trunk/src/hid_dad.h	(revision 26942)
+++ trunk/src/hid_dad.h	(revision 26943)
@@ -498,7 +498,7 @@
 			table[table ## _len - 1].field.str = (char *)val; \
 			break; \
 		case PCB_HATT_COLOR: \
-			table[table ## _len - 1].field.clr_value = *(pcb_color_t *)val; \
+			table[table ## _len - 1].field.clr = *(pcb_color_t *)val; \
 			break; \
 		case PCB_HATT_BEGIN_HBOX: \
 		case PCB_HATT_BEGIN_VBOX: \
@@ -598,7 +598,7 @@
 			table[table ## _len - 1].field.str = (char *)val_; \
 			break; \
 		case PCB_HATT_COLOR: \
-			table[table ## _len - 1].field.clr_value = *((pcb_color_t *)val_); \
+			table[table ## _len - 1].field.clr = *((pcb_color_t *)val_); \
 			break; \
 		case PCB_HATT_BEGIN_HBOX: \
 		case PCB_HATT_BEGIN_VBOX: \
Index: trunk/src_plugins/dialogs/dlg_pref_color.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_color.c	(revision 26942)
+++ trunk/src_plugins/dialogs/dlg_pref_color.c	(revision 26943)
@@ -38,7 +38,7 @@
 	if (ctx->color.wlayer != NULL) {
 		nat = conf_get_field("appearance/color/layer");
 		for (n = 0; n < nat->used; n++)
-			PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->color.wlayer[n], clr_value, nat->val.color[n]);
+			PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->color.wlayer[n], clr, nat->val.color[n]);
 	}
 
 	for(n = 0; n < ctx->color.ngen; n++) {
@@ -46,7 +46,7 @@
 		const char *path = ctx->dlg[w].user_data;
 		nat = conf_get_field(path);
 		if (nat != NULL)
-			PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, w, clr_value, nat->val.color[0]);
+			PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, w, clr, nat->val.color[0]);
 	}
 }
 
@@ -73,7 +73,7 @@
 {
 	pref_ctx_t *ctx = caller_data;
 	const char *path = attr->user_data;
-	conf_setf(ctx->role, path, -1, "%s", attr->val.clr_value.str);
+	conf_setf(ctx->role, path, -1, "%s", attr->val.clr.str);
 	pcb_gui->invalidate_all(pcb_gui);
 }
 
@@ -81,7 +81,7 @@
 {
 	pref_ctx_t *ctx = caller_data;
 	int idx = (int *)attr->user_data - ctx->color.wlayer;
-	conf_setf(ctx->role, "appearance/color/layer", idx, "%s", attr->val.clr_value.str);
+	conf_setf(ctx->role, "appearance/color/layer", idx, "%s", attr->val.clr.str);
 }
 
 
Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 26942)
+++ trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 26943)
@@ -88,8 +88,8 @@
 			}
 			break;
 		case CFN_COLOR:
-			hv.clr_value = ctx->nat->val.color[ctx->idx];
-			pcb_color_load_str(&hv.clr_value, val);
+			hv.clr = ctx->nat->val.color[ctx->idx];
+			pcb_color_load_str(&hv.clr, val);
 			pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv);
 			break;
 		case CFN_LIST:
@@ -136,7 +136,7 @@
 				return;
 			val = pcb_units[attr->val.lng].suffix;
 			break;
-		case CFN_COLOR:   val = attr->val.clr_value.str; break;
+		case CFN_COLOR:   val = attr->val.clr.str; break;
 		case CFN_LIST:
 			{
 				pcb_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval];
Index: trunk/src_plugins/dialogs/dlg_test.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_test.c	(revision 26942)
+++ trunk/src_plugins/dialogs/dlg_test.c	(revision 26943)
@@ -528,7 +528,7 @@
 	test_t *ctx = caller_data;
 
 	printf("currenct color: #%02x%02x%02x\n",
-		ctx->dlg[ctx->wclr].val.clr_value.r, ctx->dlg[ctx->wclr].val.clr_value.g, ctx->dlg[ctx->wclr].val.clr_value.b);
+		ctx->dlg[ctx->wclr].val.clr.r, ctx->dlg[ctx->wclr].val.clr.g, ctx->dlg[ctx->wclr].val.clr.b);
 }
 
 static void cb_color_reset(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
@@ -536,7 +536,7 @@
 	test_t *ctx = caller_data;
 	pcb_hid_attr_val_t val;
 
-	pcb_color_load_str(&val.clr_value, "#005599");
+	pcb_color_load_str(&val.clr, "#005599");
 	pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wclr, &val);
 }
 
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 26942)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 26943)
@@ -543,7 +543,7 @@
 			ltf_progress_set(ctx, idx, val->dbl);
 			break;
 		case PCB_HATT_COLOR:
-			ltf_colorbtn_set(ctx, idx, &val->clr_value);
+			ltf_colorbtn_set(ctx, idx, &val->clr);
 			break;
 		case PCB_HATT_PREVIEW:
 			ltf_preview_set(ctx, idx, val->dbl);
Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c	(revision 26942)
+++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c	(revision 26943)
@@ -232,7 +232,7 @@
 static void ltf_colorbtn_set(lesstif_attr_dlg_t *ctx, int idx, const pcb_color_t *clr)
 {
 	Widget btn = ctx->wl[idx];
-	ctx->attrs[idx].val.clr_value = *clr;
+	ctx->attrs[idx].val.clr = *clr;
 	pcb_ltf_color_button_recolor(display, btn, clr);
 }
 
@@ -249,7 +249,7 @@
 	if (widx < 0)
 		return;
 
-	clr = &ctx->attrs[widx].val.clr_value;
+	clr = &ctx->attrs[widx].val.clr;
 
 	argv[0].type = FGW_VOID;
 	argv[1].type = FGW_STR | FGW_DYN;
@@ -273,7 +273,7 @@
 
 	fgw_arg_free(&pcb_fgw, &res);
 	pcb_ltf_color_button_recolor(display, w, &nclr);
-	ctx->attrs[widx].val.clr_value = nclr;
+	ctx->attrs[widx].val.clr = nclr;
 	valchg(w, dlg_widget_, w);
 }
 
@@ -280,7 +280,7 @@
 
 static Widget ltf_colorbtn_create(lesstif_attr_dlg_t *ctx, Widget parent, pcb_hid_attribute_t *attr, int readonly)
 {
-	Widget pic = pcb_ltf_color_button(display, parent, XmStrCast("dad_picture"), &attr->val.clr_value);
+	Widget pic = pcb_ltf_color_button(display, parent, XmStrCast("dad_picture"), &attr->val.clr);
 	if (!readonly)
 		XtAddCallback(pic, XmNactivateCallback, ltf_colorbtn_valchg, NULL);
 	XtManageChild(pic);
Index: trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c	(revision 26942)
+++ trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c	(revision 26943)
@@ -195,7 +195,7 @@
 	pcb_gtk_color_t gclr;
 	GtkWidget *btn = ctx->wl[idx];
 
-	ctx->gctx->impl.map_color_string(val->clr_value.str, &gclr);
+	ctx->gctx->impl.map_color_string(val->clr.str, &gclr);
 	gtkc_color_button_set_color(btn, &gclr);
 
 	return 0;
Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 26942)
+++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 26943)
@@ -185,7 +185,7 @@
 
 	gtkc_color_button_get_color(GTK_WIDGET(button), &clr);
 	str = ctx->gctx->impl.get_color_name(&clr);
-	pcb_color_load_str(&dst->val.clr_value, str);
+	pcb_color_load_str(&dst->val.clr, str);
 
 	change_cb(ctx, dst);
 }
Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c
===================================================================
--- trunk/src_plugins/lib_hid_common/dlg_comm_m.c	(revision 26942)
+++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c	(revision 26943)
@@ -144,7 +144,7 @@
 	clrpick_t *ctx = caller_data;
 
 	pcb_color_load_int(&ctx->clr, clamp(ctx->dlg[ctx->wr].val.lng), clamp(ctx->dlg[ctx->wg].val.lng), clamp(ctx->dlg[ctx->wb].val.lng), 255);
-	val.clr_value = ctx->clr;
+	val.clr = ctx->clr;
 	pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wclr, &val);
 }
 
@@ -195,7 +195,7 @@
 	pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wg, &val);
 	val.lng = ctx.clr.b;
 	pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wb, &val);
-	val.clr_value = ctx.clr;
+	val.clr = ctx.clr;
 	pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wclr, &val);
 
 	if (PCB_DAD_RUN(ctx.dlg) != 0) {
Index: trunk/src_plugins/propedit/propdlg.c
===================================================================
--- trunk/src_plugins/propedit/propdlg.c	(revision 26942)
+++ trunk/src_plugins/propedit/propdlg.c	(revision 26943)
@@ -227,7 +227,7 @@
 		case PCB_PROPT_ANGLE:  hv.dbl = pv->angle; break;
 		case PCB_PROPT_BOOL:
 		case PCB_PROPT_INT:    hv.lng = pv->i; break;
-		case PCB_PROPT_COLOR:  hv.clr_value = pv->clr; break;
+		case PCB_PROPT_COLOR:  hv.clr = pv->clr; break;
 		case PCB_PROPT_invalid:
 		case PCB_PROPT_max: return;
 	}
@@ -342,7 +342,7 @@
 			sctx.c_valid = 1;
 			break;
 		case PCB_PROPT_COLOR:
-			sctx.color = ctx->dlg[ctx->wedit[p->type]].val.clr_value;
+			sctx.color = ctx->dlg[ctx->wedit[p->type]].val.clr;
 			sctx.clr_valid = 1;
 			break;
 	}