Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 16219)
+++ trunk/src/board.h	(revision 16220)
@@ -70,8 +70,8 @@
 
 	pcb_bool Changed;                               /* layout has been changed */
 
-	pcb_bool ViaOn, RatOn, InvisibleObjectsOn,
-	         PinOn, SubcOn, SubcPartsOn,
+	pcb_bool pstk_on, RatOn, InvisibleObjectsOn,
+	         SubcOn, SubcPartsOn,
 	         padstack_mark_on, hole_on;             /* visibility flags */
 	pcb_bool RatDraw;                               /* we're drawing rats */
 
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 16219)
+++ trunk/src/buffer.c	(revision 16220)
@@ -616,7 +616,7 @@
 	PCB_END_LOOP;
 
 	/* finally: padstacks */
-	if (pcb->ViaOn) {
+	if (pcb->pstk_on) {
 		pcb_board_t dummy;
 		changed |= (padstacklist_length(&(PCB_PASTEBUFFER->Data->padstack)) != 0);
 
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 16219)
+++ trunk/src/crosshair.c	(revision 16220)
@@ -216,7 +216,7 @@
 	PCB_END_LOOP;
 
 	/* and the padstacks */
-	if (PCB->ViaOn)
+	if (PCB->pstk_on)
 		PCB_PADSTACK_LOOP(Buffer->Data);
 	{
 		thindraw_moved_ps(padstack, x, y);
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 16219)
+++ trunk/src/draw.c	(revision 16220)
@@ -436,22 +436,22 @@
 
 /* ---------------------------------------------------------------------------
  * Draws padstacks - Always draws for non-gui HIDs,
- * otherwise drawing depends on PCB->PinOn and PCB->ViaOn
+ * otherwise drawing depends on PCB->pstk_on
  */
 void pcb_draw_ppv(pcb_layergrp_id_t group, const pcb_box_t * drawn_area)
 {
 	/* draw padstack holes - copper is drawn with each group */
-	if (PCB->ViaOn || !pcb_gui->gui)
+	if (PCB->pstk_on || !pcb_gui->gui)
 		pcb_draw_pstk_holes(group, drawn_area, PCB_PHOLE_PLATED | PCB_PHOLE_UNPLATED | PCB_PHOLE_BB);
 }
 
 /* ---------------------------------------------------------------------------
  * Draws padstacks' names - Always draws for non-gui HIDs,
- * otherwise drawing depends on PCB->PinOn and PCB->ViaOn
+ * otherwise drawing depends on PCB->pstk_on
  */
 void pcb_draw_pstk_names(pcb_layergrp_id_t group, const pcb_box_t *drawn_area)
 {
-	if (PCB->PinOn || !pcb_gui->gui) {
+	if (PCB->pstk_on || !pcb_gui->gui) {
 		size_t n;
 		for(n = 0; n < delayed_labels.used; n++)
 			pcb_draw_obj_label(group, delayed_labels.array[n]);
@@ -679,7 +679,7 @@
 
 	switch (obj->type) {
 	case PCB_OBJ_PSTK:
-		if (PCB->ViaOn)
+		if (PCB->pstk_on)
 			pcb_pstk_invalidate_draw((pcb_pstk_t *)obj);
 		break;
 	case PCB_OBJ_LINE:
Index: trunk/src/find_misc.c
===================================================================
--- trunk/src/find_misc.c	(revision 16219)
+++ trunk/src/find_misc.c	(revision 16220)
@@ -117,10 +117,10 @@
 		pcb_pstk_t *ps = PADSTACKLIST_ENTRY(PadstackList.DrawLocation);
 
 		if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, ps)) {
-			if (PCB->PinOn)
+			if (PCB->pstk_on)
 				pcb_pstk_invalidate_draw(ps);
 		}
-		else if (PCB->ViaOn)
+		else if (PCB->pstk_on)
 			pcb_pstk_invalidate_draw(ps);
 		PadstackList.DrawLocation++;
 	}
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 16219)
+++ trunk/src/gui_act.c	(revision 16220)
@@ -1654,16 +1654,11 @@
 		else
 			pcb_message(PCB_MSG_ERROR, "Can't find this-side silk layer\n");
 	}
-	else if (pcb_strcasecmp(argv[0], "vias") == 0) {
-		PCB->ViaOn = !PCB->ViaOn;
+	else if ((pcb_strcasecmp(argv[0], "padstacks") == 0) || (pcb_strcasecmp(argv[0], "vias") == 0) || (pcb_strcasecmp(argv[0], "pins") == 0) || (pcb_strcasecmp(argv[0], "pads") == 0)) {
+		PCB->pstk_on = !PCB->pstk_on;
 		pcb_gui->invalidate_all();
 		pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
 	}
-	else if ((pcb_strcasecmp(argv[0], "pins") == 0) || (pcb_strcasecmp(argv[0], "pads") == 0)) {
-		PCB->PinOn = !PCB->PinOn;
-		pcb_gui->invalidate_all();
-		pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
-	}
 	else if (pcb_strcasecmp(argv[0], "BackSide") == 0) {
 		PCB->InvisibleObjectsOn = !PCB->InvisibleObjectsOn;
 		pcb_gui->invalidate_all();
Index: trunk/src/layer_vis.c
===================================================================
--- trunk/src/layer_vis.c	(revision 16219)
+++ trunk/src/layer_vis.c	(revision 16220)
@@ -45,7 +45,7 @@
  * pcb_layervis_restore_stack()
  */
 static struct {
-	pcb_bool ElementOn, InvisibleObjectsOn, PinOn, ViaOn, RatOn;
+	pcb_bool ElementOn, InvisibleObjectsOn, pstk_on, RatOn;
 	int pcb_layer_stack[PCB_MAX_LAYER];
 	pcb_bool LayerOn[PCB_MAX_LAYER];
 	int cnt;
@@ -145,8 +145,7 @@
 		PCB->Data->Layer[i].meta.real.vis = pcb_true;
 	}
 	PCB->InvisibleObjectsOn = pcb_true;
-	PCB->PinOn = pcb_true;
-	PCB->ViaOn = pcb_true;
+	PCB->pstk_on = pcb_true;
 	PCB->SubcOn = pcb_true;
 	PCB->SubcPartsOn = pcb_true;
 	PCB->RatOn = pcb_true;
@@ -181,8 +180,7 @@
 	}
 	SavedStack.ElementOn = pcb_silk_on(PCB);
 	SavedStack.InvisibleObjectsOn = PCB->InvisibleObjectsOn;
-	SavedStack.PinOn = PCB->PinOn;
-	SavedStack.ViaOn = PCB->ViaOn;
+	SavedStack.pstk_on = PCB->pstk_on;
 	SavedStack.RatOn = PCB->RatOn;
 	SavedStack.cnt++;
 }
@@ -208,8 +206,7 @@
 		PCB->Data->Layer[i].meta.real.vis = SavedStack.LayerOn[i];
 	}
 	PCB->InvisibleObjectsOn = SavedStack.InvisibleObjectsOn;
-	PCB->PinOn = SavedStack.PinOn;
-	PCB->ViaOn = SavedStack.ViaOn;
+	PCB->pstk_on = SavedStack.pstk_on;
 	PCB->RatOn = SavedStack.RatOn;
 
 	SavedStack.cnt--;
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 16219)
+++ trunk/src/obj_line.c	(revision 16220)
@@ -678,7 +678,7 @@
 	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, ctx->move.dst_layer, newone);
 	if (ctx->move.dst_layer->meta.real.vis)
 		pcb_line_invalidate_draw(ctx->move.dst_layer, newone);
-	if (!conf_core.editor.auto_via || !PCB->ViaOn || ctx->move.more_to_come ||
+	if (!conf_core.editor.auto_via || !PCB->pstk_on || ctx->move.more_to_come ||
 			pcb_layer_get_group_(Layer) ==
 			pcb_layer_get_group_(ctx->move.dst_layer) || !(pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, Layer)) & PCB_LYT_COPPER) || !(pcb_layer_flags_(ctx->move.dst_layer) & PCB_LYT_COPPER))
 		return newone;
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 16219)
+++ trunk/src/obj_subc.c	(revision 16220)
@@ -1039,7 +1039,7 @@
 {
 	pcb_bool change = pcb_false;
 
-	if (PCB->PinOn && pcb_silk_on(PCB)) {
+	if (PCB->pstk_on && pcb_silk_on(PCB)) {
 		PCB_SUBC_LOOP(PCB->Data);
 		{
 			if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc)) {
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 16219)
+++ trunk/src/object_act.c	(revision 16220)
@@ -759,7 +759,7 @@
 				}
 			}
 			PCB_ENDALL_LOOP;
-			if (PCB->ViaOn)
+			if (PCB->pstk_on)
 			PCB_PADSTACK_LOOP(PCB->Data);
 			{
 				if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, padstack)
Index: trunk/src/operation.c
===================================================================
--- trunk/src/operation.c	(revision 16219)
+++ trunk/src/operation.c	(revision 16220)
@@ -189,7 +189,7 @@
 
 
 	/* process padstacks */
-	if (type & PCB_OBJ_PSTK && pcb->ViaOn && F->padstack) {
+	if (type & PCB_OBJ_PSTK && pcb->pstk_on && F->padstack) {
 		PCB_PADSTACK_LOOP(data);
 		{
 			if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, padstack)) {
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 16219)
+++ trunk/src/search.c	(revision 16220)
@@ -119,7 +119,7 @@
 	struct ans_info info;
 
 	/* search only if via-layer is visible */
-	if (!PCB->ViaOn)
+	if (!PCB->pstk_on)
 		return pcb_false;
 
 	info.ptr1 = (void **)ps;
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 16219)
+++ trunk/src/select.c	(revision 16220)
@@ -329,7 +329,7 @@
 	}
 
 	/* end with vias */
-	if (pcb->ViaOn || !Flag) {
+	if (pcb->pstk_on || !Flag) {
 		PCB_PADSTACK_LOOP(pcb->Data);
 		{
 			if (pcb_pstk_near_box(padstack, Box, NULL)
@@ -336,7 +336,7 @@
 					&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)
 					&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, padstack) != Flag) {
 				append(PCB_OBJ_PSTK, padstack, padstack);
-				if (pcb->ViaOn)
+				if (pcb->pstk_on)
 					pcb_pstk_invalidate_draw(padstack);
 			}
 		}
Index: trunk/src/tool_line.c
===================================================================
--- trunk/src/tool_line.c	(revision 16219)
+++ trunk/src/tool_line.c	(revision 16220)
@@ -138,7 +138,7 @@
 		/* place a via if vias are visible, the layer is
 			 in a new group since the last line and there
 			 isn't a pin already here */
-		if (conf_core.editor.auto_via && PCB->ViaOn
+		if (conf_core.editor.auto_via && PCB->pstk_on
 				&& pcb_layer_get_group_(CURRENT) != pcb_layer_get_group_(last_layer)
 				&& pcb_search_obj_by_location(PCB_OBJ_CLASS_PIN, &ptr1, &ptr2, &ptr3,
 																			pcb_crosshair.AttachedLine.Point1.X,
@@ -229,7 +229,7 @@
 			/* place a via if vias are visible, the layer is
 				 in a new group since the last line and there
 				 isn't a pin already here */
-			if (PCB->ViaOn 
+			if (PCB->pstk_on
 					&& pcb_layer_get_group_(CURRENT) != pcb_layer_get_group_(last_layer) 
 					&& (pcb_layer_flags_(CURRENT) & PCB_LYT_COPPER)
 					&& (pcb_layer_flags_(last_layer) & PCB_LYT_COPPER)
Index: trunk/src/tool_via.c
===================================================================
--- trunk/src/tool_via.c	(revision 16219)
+++ trunk/src/tool_via.c	(revision 16220)
@@ -53,7 +53,7 @@
 void pcb_tool_via_notify_mode(void)
 {
 
-	if (!PCB->ViaOn) {
+	if (!PCB->pstk_on) {
 		pcb_message(PCB_MSG_WARNING, _("You must turn via visibility on before\n" "you can place vias\n"));
 		return;
 	}
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 16219)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 16220)
@@ -964,7 +964,7 @@
 		}
 	}
 	/* if via visibility is turned off, don't use them */
-	AutoRouteParameters.use_vias = routing_layers > 1 && PCB->ViaOn;
+	AutoRouteParameters.use_vias = routing_layers > 1 && PCB->pstk_on;
 
 	back = front = -1;
 	if (pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &back, 1) <= 0)
Index: trunk/src_plugins/hid_lesstif/netlist.c
===================================================================
--- trunk/src_plugins/hid_lesstif/netlist.c	(revision 16219)
+++ trunk/src_plugins/hid_lesstif/netlist.c	(revision 16220)
@@ -185,7 +185,7 @@
 	}
 	PCB_ENDALL_LOOP;
 
-	if (PCB->ViaOn)
+	if (PCB->pstk_on)
 		PCB_PADSTACK_LOOP(PCB->Data);
 		{
 			if (PCB_FLAG_TEST(PCB_FLAG_FOUND, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack))
Index: trunk/src_plugins/lib_gtk_common/dlg_netlist.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_netlist.c	(revision 16219)
+++ trunk/src_plugins/lib_gtk_common/dlg_netlist.c	(revision 16220)
@@ -534,7 +534,7 @@
 	}
 	PCB_ENDALL_LOOP;
 
-	if (PCB->ViaOn)
+	if (PCB->pstk_on)
 		PCB_PADSTACK_LOOP(PCB->Data);
 		{
 			if (PCB_FLAG_TEST(PCB_FLAG_FOUND, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack))
Index: trunk/src_plugins/lib_gtk_common/dlg_propedit.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_propedit.c	(revision 16219)
+++ trunk/src_plugins/lib_gtk_common/dlg_propedit.c	(revision 16220)
@@ -308,7 +308,7 @@
 	preview_pcb.MaxWidth = preview_pcb.MaxHeight = PCB_MIL_TO_COORD(1000);
 	pcb_layer_colors_from_conf(&preview_pcb);
 	pcb_font_create_default(&preview_pcb);
-	preview_pcb.ViaOn = 1;
+	preview_pcb.pstk_on = 1;
 
 	for (n = 0; n < pcb_max_layer; n++) {
 		preview_pcb.Data->Layer[n].meta.real.vis = 1;