6 files changed, 11 insertions, 11 deletions
diff --git a/libproto/pop/mbox.c b/libproto/pop/mbox.c
index 68e2d93db..f5132957c 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mbox.c
@@ -162,9 +162,9 @@ pop_open (mu_mailbox_t mbox, int flags)
   if (mu_debug_check_level (mbox->debug, MU_DEBUG_PROT))
     mu_pop3_trace (mpd->pop3, MU_POP3_TRACE_SET);
   if (mu_debug_check_level (mbox->debug, MU_DEBUG_TRACE6))
-    mu_pop3_trace_mask (mpd->pop3, MU_POP3_TRACE_SET, XSCRIPT_SECURE);
+    mu_pop3_trace_mask (mpd->pop3, MU_POP3_TRACE_SET, MU_XSCRIPT_SECURE);
   if (mu_debug_check_level (mbox->debug, MU_DEBUG_TRACE7))
-    mu_pop3_trace_mask (mpd->pop3, MU_POP3_TRACE_SET, XSCRIPT_PAYLOAD);
+    mu_pop3_trace_mask (mpd->pop3, MU_POP3_TRACE_SET, MU_XSCRIPT_PAYLOAD);
     
   do
     {
diff --git a/libproto/pop/pop3_pass.c b/libproto/pop/pop3_pass.c
index 30f823f96..d72c511f2 100644
--- a/libproto/pop/pop3_pass.c
+++ b/libproto/pop/pop3_pass.c
@@ -35,10 +35,10 @@ mu_pop3_pass (mu_pop3_t pop3, const char *passwd)
   switch (pop3->state)
     {
     case MU_POP3_NO_STATE:
-      if (mu_pop3_trace_mask (pop3, MU_POP3_TRACE_QRY, XSCRIPT_SECURE))
-	_mu_pop3_xscript_level (pop3, XSCRIPT_SECURE);
+      if (mu_pop3_trace_mask (pop3, MU_POP3_TRACE_QRY, MU_XSCRIPT_SECURE))
+	_mu_pop3_xscript_level (pop3, MU_XSCRIPT_SECURE);
       status = mu_pop3_writeline (pop3, "PASS %s\r\n", passwd);
-      _mu_pop3_xscript_level (pop3, XSCRIPT_NORMAL);
+      _mu_pop3_xscript_level (pop3, MU_XSCRIPT_NORMAL);
       MU_POP3_CHECK_ERROR (pop3, status);
       /* FIXME: how to obscure the passwd in the stream buffer? */
       MU_POP3_FCLR (pop3, MU_POP3_ACK);
diff --git a/libproto/pop/pop3_retr.c b/libproto/pop/pop3_retr.c
index fc454da93..aca24da65 100644
--- a/libproto/pop/pop3_retr.c
+++ b/libproto/pop/pop3_retr.c
@@ -50,8 +50,8 @@ mu_pop3_retr (mu_pop3_t pop3, unsigned int msgno, mu_stream_t *pstream)
       MU_POP3_CHECK_OK (pop3);
       status = mu_pop3_stream_create (pop3, pstream);
       MU_POP3_CHECK_ERROR (pop3, status);
-      if (mu_pop3_trace_mask (pop3, MU_POP3_TRACE_QRY, XSCRIPT_PAYLOAD))
-	_mu_pop3_xscript_level (pop3, XSCRIPT_PAYLOAD);
+      if (mu_pop3_trace_mask (pop3, MU_POP3_TRACE_QRY, MU_XSCRIPT_PAYLOAD))
+	_mu_pop3_xscript_level (pop3, MU_XSCRIPT_PAYLOAD);
       pop3->state = MU_POP3_RETR_RX;
 
     case MU_POP3_RETR_RX:
diff --git a/libproto/pop/pop3_stream.c b/libproto/pop/pop3_stream.c
index bd2bd078f..25fdba691 100644
--- a/libproto/pop/pop3_stream.c
+++ b/libproto/pop/pop3_stream.c
@@ -185,7 +185,7 @@ _pop3_event_cb (mu_stream_t str, int ev, int flags)
       if (mu_stream_ioctl (str, MU_IOCTL_GET_TRANSPORT, trans) == 0)
 	{
 	  struct mu_pop3_stream *sp = (struct mu_pop3_stream *) trans[0];
-	  _mu_pop3_xscript_level (sp->pop3, XSCRIPT_NORMAL);
+	  _mu_pop3_xscript_level (sp->pop3, MU_XSCRIPT_NORMAL);
 	  sp->pop3->state = MU_POP3_NO_STATE;
 	}
     }
diff --git a/libproto/pop/pop3_top.c b/libproto/pop/pop3_top.c
index ebea77fb4..c06073606 100644
--- a/libproto/pop/pop3_top.c
+++ b/libproto/pop/pop3_top.c
@@ -50,8 +50,8 @@ mu_pop3_top (mu_pop3_t pop3, unsigned msgno, unsigned int lines,
       MU_POP3_CHECK_OK (pop3);
       status = mu_pop3_stream_create (pop3, pstream);
       MU_POP3_CHECK_ERROR (pop3, status);
-      if (mu_pop3_trace_mask (pop3, MU_POP3_TRACE_QRY, XSCRIPT_PAYLOAD))
-	_mu_pop3_xscript_level (pop3, XSCRIPT_PAYLOAD);
+      if (mu_pop3_trace_mask (pop3, MU_POP3_TRACE_QRY, MU_XSCRIPT_PAYLOAD))
+	_mu_pop3_xscript_level (pop3, MU_XSCRIPT_PAYLOAD);
       pop3->state = MU_POP3_TOP_RX;
 
     case MU_POP3_TOP_RX:
diff --git a/libproto/pop/pop3_trace.c b/libproto/pop/pop3_trace.c
index 514ac3cad..5fa3d95d6 100644
--- a/libproto/pop/pop3_trace.c
+++ b/libproto/pop/pop3_trace.c
@@ -144,7 +144,7 @@ _mu_pop3_xscript_level (mu_pop3_t pop3, int xlev)
 {
   if (mu_stream_ioctl (pop3->carrier, MU_IOCTL_LEVEL, &xlev) == 0)
     return xlev;
-  return XSCRIPT_NORMAL;
+  return MU_XSCRIPT_NORMAL;
 }