Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 15924)
+++ trunk/src/draw.c	(revision 15925)
@@ -225,7 +225,7 @@
 	solder = component = -1;
 	pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder, 1);
 	pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &component, 1);
-	side_copper_grp = PCB_SWAP_IDENT ? solder : component;
+	side_copper_grp = conf_core.editor.show_solder_side ? solder : component;
 
 
 	/*
@@ -272,7 +272,7 @@
 	pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
 	pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
 	if (pcb_gui->gui)
-		pcb_draw_ppv(PCB_SWAP_IDENT ? solder : component, drawn_area);
+		pcb_draw_ppv(conf_core.editor.show_solder_side ? solder : component, drawn_area);
 	else if (!pcb_gui->holes_after)
 		DrawEverything_holes(side_copper_grp, drawn_area);
 	pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
@@ -369,7 +369,7 @@
 		/* Draw pins' and pads' names */
 		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
 		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
-		pcb_draw_pstk_names(PCB_SWAP_IDENT ? solder : component, drawn_area);
+		pcb_draw_pstk_names(conf_core.editor.show_solder_side ? solder : component, drawn_area);
 		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
 	}
 
Index: trunk/src/macro.h
===================================================================
--- trunk/src/macro.h	(revision 15924)
+++ trunk/src/macro.h	(revision 15925)
@@ -32,10 +32,6 @@
 #ifndef	PCB_MACRO_H
 #define	PCB_MACRO_H
 
-#ifndef	PCB_SWAP_IDENT
-#define	PCB_SWAP_IDENT			conf_core.editor.show_solder_side
-#endif
-
 #define PCB_ENTRIES(x)         (sizeof((x))/sizeof((x)[0]))
 #define PCB_UNKNOWN(a)         ((a) && *(a) ? (a) : "(unknown)")
 #define PCB_NSTRCMP(a, b)      ((a) ? ((b) ? strcmp((a),(b)) : 1) : -1)
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 15924)
+++ trunk/src/plug_io.c	(revision 15925)
@@ -731,10 +731,10 @@
 {
 	int result;
 
-	if (PCB_SWAP_IDENT)
+	if (conf_core.editor.show_solder_side)
 		pcb_buffers_flip_side(PCB);
 	result = pcb_write_pipe(Filename, pcb_false, fmt, pcb_true);
-	if (PCB_SWAP_IDENT)
+	if (conf_core.editor.show_solder_side)
 		pcb_buffers_flip_side(PCB);
 	return result;
 }
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 15924)
+++ trunk/src/search.c	(revision 15925)
@@ -481,7 +481,7 @@
 }
 
 #warning subc TODO: this is not how it is done - PCB_FLAG_ONSOLDER is not used for subc
-#define PCB_FRONT(o) ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (o)) != 0) == PCB_SWAP_IDENT)
+#define PCB_FRONT(o) ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (o)) != 0) == conf_core.editor.show_solder_side)
 
 static pcb_r_dir_t subc_callback(const pcb_box_t *box, void *cl)
 {
Index: trunk/src/tool_rotate.c
===================================================================
--- trunk/src/tool_rotate.c	(revision 15924)
+++ trunk/src/tool_rotate.c	(revision 15925)
@@ -43,8 +43,8 @@
 
 void pcb_tool_rotate_notify_mode(void)
 {
-	pcb_screen_obj_rotate90(pcb_tool_note.X, pcb_tool_note.Y, pcb_gui->shift_is_pressed()? (PCB_SWAP_IDENT ? 1 : 3)
-									 : (PCB_SWAP_IDENT ? 3 : 1));
+	pcb_screen_obj_rotate90(pcb_tool_note.X, pcb_tool_note.Y, pcb_gui->shift_is_pressed()? (conf_core.editor.show_solder_side ? 1 : 3)
+									 : (conf_core.editor.show_solder_side ? 3 : 1));
 }
 
 pcb_tool_t pcb_tool_rotate = {
Index: trunk/src_plugins/stroke/stroke.c
===================================================================
--- trunk/src_plugins/stroke/stroke.c	(revision 15924)
+++ trunk/src_plugins/stroke/stroke.c	(revision 15925)
@@ -75,13 +75,13 @@
 		case 987412:
 		case 8741236:
 		case 874123:
-			pcb_screen_obj_rotate90(StrokeBox.X1, StrokeBox.Y1, PCB_SWAP_IDENT ? 1 : 3);
+			pcb_screen_obj_rotate90(StrokeBox.X1, StrokeBox.Y1, conf_core.editor.show_solder_side ? 1 : 3);
 			break;
 		case 7896321:
 		case 786321:
 		case 789632:
 		case 896321:
-			pcb_screen_obj_rotate90(StrokeBox.X1, StrokeBox.Y1, PCB_SWAP_IDENT ? 3 : 1);
+			pcb_screen_obj_rotate90(StrokeBox.X1, StrokeBox.Y1, conf_core.editor.show_solder_side ? 3 : 1);
 			break;
 		case 258:
 			pcb_crosshair_set_mode(PCB_MODE_LINE);