Index: conf_act.c
===================================================================
--- conf_act.c	(revision 4861)
+++ conf_act.c	(revision 4862)
@@ -60,13 +60,13 @@
 		int res;
 
 		if (argc < 3) {
-			Message(PCB_MSG_DEFAULT, "conf(set) needs at least two arguments");
+			pcb_message(PCB_MSG_DEFAULT, "conf(set) needs at least two arguments");
 			return 1;
 		}
 		if (argc > 3) {
 			role = conf_role_parse(argv[3]);
 			if (role == CFR_invalid) {
-				Message(PCB_MSG_DEFAULT, "Invalid role: '%s'", argv[3]);
+				pcb_message(PCB_MSG_DEFAULT, "Invalid role: '%s'", argv[3]);
 				return 1;
 			}
 		}
@@ -73,7 +73,7 @@
 		if (argc > 4) {
 			pol = conf_policy_parse(argv[4]);
 			if (pol == POL_invalid) {
-				Message(PCB_MSG_DEFAULT, "Invalid policy: '%s'", argv[4]);
+				pcb_message(PCB_MSG_DEFAULT, "Invalid policy: '%s'", argv[4]);
 				return 1;
 			}
 		}
@@ -83,7 +83,7 @@
 		if (role == CFR_invalid) {
 			conf_native_t *n = conf_get_field(argv[1]);
 			if (n == NULL) {
-				Message(PCB_MSG_DEFAULT, "Invalid conf field '%s': no such path\n", argv[1]);
+				pcb_message(PCB_MSG_DEFAULT, "Invalid conf field '%s': no such path\n", argv[1]);
 				return 1;
 			}
 			res = conf_set_native(n, 0, val);
@@ -91,7 +91,7 @@
 		else
 			res = conf_set(role, path, -1, val, pol);
 		if (res != 0) {
-			Message(PCB_MSG_DEFAULT, "conf(set) failed.\n");
+			pcb_message(PCB_MSG_DEFAULT, "conf(set) failed.\n");
 			return 1;
 		}
 	}
@@ -103,7 +103,7 @@
 		conf_native_t *n;
 
 		if (argc != 3) {
-			Message(PCB_MSG_ERROR, "conf(iseq) needs two arguments");
+			pcb_message(PCB_MSG_ERROR, "conf(iseq) needs two arguments");
 			return -1;
 		}
 		path = argv[1];
@@ -111,7 +111,7 @@
 
 		n = conf_get_field(argv[1]);
 		if (n == NULL) {
-			Message(PCB_MSG_ERROR, "Invalid conf field '%s' in iseq: no such path\n", path);
+			pcb_message(PCB_MSG_ERROR, "Invalid conf field '%s' in iseq: no such path\n", path);
 			return -1;
 		}
 
@@ -131,21 +131,21 @@
 		int res;
 
 		if (n == NULL) {
-			Message(PCB_MSG_DEFAULT, "Invalid conf field '%s': no such path\n", argv[1]);
+			pcb_message(PCB_MSG_DEFAULT, "Invalid conf field '%s': no such path\n", argv[1]);
 			return 1;
 		}
 		if (n->type != CFN_BOOLEAN) {
-			Message(PCB_MSG_DEFAULT, "Can not toggle '%s': not a boolean\n", argv[1]);
+			pcb_message(PCB_MSG_DEFAULT, "Can not toggle '%s': not a boolean\n", argv[1]);
 			return 1;
 		}
 		if (n->used != 1) {
-			Message(PCB_MSG_DEFAULT, "Can not toggle '%s': array size should be 1, not %d\n", argv[1], n->used);
+			pcb_message(PCB_MSG_DEFAULT, "Can not toggle '%s': array size should be 1, not %d\n", argv[1], n->used);
 			return 1;
 		}
 		if (argc > 2) {
 			role = conf_role_parse(argv[2]);
 			if (role == CFR_invalid) {
-				Message(PCB_MSG_DEFAULT, "Invalid role: '%s'", argv[2]);
+				pcb_message(PCB_MSG_DEFAULT, "Invalid role: '%s'", argv[2]);
 				return 1;
 			}
 		}
@@ -159,7 +159,7 @@
 			res = conf_set(role, argv[1], -1, new_value, POL_OVERWRITE);
 
 		if (res != 0) {
-			Message(PCB_MSG_DEFAULT, "Can not toggle '%s': failed to set new value\n", argv[1]);
+			pcb_message(PCB_MSG_DEFAULT, "Can not toggle '%s': failed to set new value\n", argv[1]);
 			return 1;
 		}
 		conf_update(argv[1]);
@@ -169,7 +169,7 @@
 		conf_role_t role;
 		role = conf_role_parse(argv[1]);
 		if (role == CFR_invalid) {
-			Message(PCB_MSG_DEFAULT, "Invalid role: '%s'", argv[1]);
+			pcb_message(PCB_MSG_DEFAULT, "Invalid role: '%s'", argv[1]);
 			return 1;
 		}
 		conf_reset(role, "<action>");
@@ -177,7 +177,7 @@
 	}
 
 	else {
-		Message(PCB_MSG_DEFAULT, "Invalid conf command '%s'\n", argv[0]);
+		pcb_message(PCB_MSG_DEFAULT, "Invalid conf command '%s'\n", argv[0]);
 		return 1;
 	}
 	return 0;
@@ -225,7 +225,7 @@
 		if (strcmp(m->name, argv[0]) == 0)
 			return conf_core.editor.mode == m->mode;
 	}
-	Message(PCB_MSG_DEFAULT, "Unknown mode in ChkMode(): %s\n", argv[1]);
+	pcb_message(PCB_MSG_DEFAULT, "Unknown mode in ChkMode(): %s\n", argv[1]);
 	abort();
 	return -1;
 }