Index: shape.c
===================================================================
--- shape.c	(revision 17410)
+++ shape.c	(revision 17411)
@@ -315,8 +315,9 @@
 
 static const char pcb_acts_regpoly[] = "regpoly([where,] corners, radius [,rotation])";
 static const char pcb_acth_regpoly[] = "Generate regular polygon. Where is x;y and radius is either r or rx;ry. Rotation is in degrees.";
-int pcb_act_regpoly(int argc, const char **argv)
+int pcb_act_regpoly(int oargc, const char **oargv)
 {
+	PCB_OLD_ACT_BEGIN;
 	double rot = 0;
 	pcb_coord_t x, y, rx, ry = 0;
 	pcb_bool succ, have_coords = pcb_false;
@@ -367,13 +368,15 @@
 		pcb_message(PCB_MSG_ERROR, "regpoly(): failed to create the polygon\n");
 
 	return 0;
+	PCB_OLD_ACT_END;
 }
 
 
 static const char pcb_acts_roundrect[] = "roundrect([where,] width[;height] [,rx[;ry] [,rotation]])";
 static const char pcb_acth_roundrect[] = "Generate a rectangle with round corners";
-int pcb_act_roundrect(int argc, const char **argv)
+int pcb_act_roundrect(int oargc, const char **oargv)
 {
+	PCB_OLD_ACT_BEGIN;
 	int a;
 	pcb_data_t *data;
 	pcb_bool succ, have_coords = pcb_false;
@@ -429,12 +432,14 @@
 		pcb_message(PCB_MSG_ERROR, "roundrect(): failed to create the polygon\n");
 
 	return 0;
+	PCB_OLD_ACT_END;
 }
 
 static const char pcb_acts_circle[] = "circle([where,] diameter)";
 static const char pcb_acth_circle[] = "Generate a filled circle (zero length round cap line)";
-int pcb_act_circle(int argc, const char **argv)
+int pcb_act_circle(int oargc, const char **oargv)
 {
+	PCB_OLD_ACT_BEGIN;
 	int a;
 	pcb_data_t *data;
 	pcb_bool succ, have_coords = pcb_false;
@@ -471,6 +476,7 @@
 		pcb_message(PCB_MSG_ERROR, "circle(): failed to create the polygon\n");
 
 	return 0;
+	PCB_OLD_ACT_END;
 }
 
 #include "shape_dialog.c"
Index: shape_dialog.c
===================================================================
--- shape_dialog.c	(revision 17410)
+++ shape_dialog.c	(revision 17411)
@@ -354,9 +354,11 @@
 
 static const char pcb_acts_shape[] = "shape()";
 static const char pcb_acth_shape[] = "Interactive shape generator.";
-int pcb_act_shape(int argc, const char **argv)
+int pcb_act_shape(int oargc, const char **oargv)
 {
+	PCB_OLD_ACT_BEGIN;
 	pcb_shape_dialog(PCB, PCB_PASTEBUFFER->Data, pcb_shape_current_layer, pcb_false);
 	return 0;
+	PCB_OLD_ACT_END;
 }