Normalize global namespace. Part 2

1 files changed, 22 insertions, 22 deletions

diff --git a/mail.remote/mail.remote.c b/mail.remote/mail.remote.c
index aeb372d25..3d53e78a2 100644
--- a/mail.remote/mail.remote.c
+++ b/mail.remote/mail.remote.c
@@ -132,6 +132,6 @@ static const char *capa[] = {
 
-mailer_t mailer;     /* Mailer object */ 
-address_t from;      /* Sender address */ 
-address_t to;        /* Recipient addresses */
-stream_t in;         /* Input stream */
+mu_mailer_t mailer;     /* Mailer object */ 
+mu_address_t from;      /* Sender address */ 
+mu_address_t to;        /* Recipient addresses */
+mu_stream_t in;         /* Input stream */
 
@@ -142,4 +142,4 @@ mr_exit (int status)
   mu_address_destroy (&to);
-  stream_destroy (&in, NULL);
-  mailer_destroy (&mailer);
+  mu_stream_destroy (&in, NULL);
+  mu_mailer_destroy (&mailer);
 
@@ -154,3 +154,3 @@ main (int argc, char **argv)
 
-  message_t msg = 0;
+  mu_message_t msg = 0;
 
@@ -162,3 +162,3 @@ main (int argc, char **argv)
   /* Register mailers. */
-  registrar_record (smtp_record);
+  mu_registrar_record (mu_smtp_record);
 
@@ -188,3 +188,3 @@ main (int argc, char **argv)
      
-  if ((status = stdio_stream_create (&in, stdin, MU_STREAM_SEEKABLE)))
+  if ((status = mu_stdio_stream_create (&in, stdin, MU_STREAM_SEEKABLE)))
     {
@@ -194,3 +194,3 @@ main (int argc, char **argv)
 
-  if ((status = stream_open (in)))
+  if ((status = mu_stream_open (in)))
     {
@@ -200,3 +200,3 @@ main (int argc, char **argv)
 
-  if ((status = message_create (&msg, NULL)))
+  if ((status = mu_message_create (&msg, NULL)))
     {
@@ -206,3 +206,3 @@ main (int argc, char **argv)
 
-  if ((status = message_set_stream (msg, in, NULL)))
+  if ((status = mu_message_set_stream (msg, in, NULL)))
     {
@@ -212,6 +212,6 @@ main (int argc, char **argv)
 
-  if ((status = mailer_create (&mailer, NULL)))
+  if ((status = mu_mailer_create (&mailer, NULL)))
     {
       const char *url = NULL;
-      mailer_get_url_default (&url);
+      mu_mailer_get_url_default (&url);
       mu_error (_("Creating mailer `%s' failed: %s"),
@@ -224,3 +224,3 @@ main (int argc, char **argv)
       mu_debug_t debug;
-      mailer_get_debug (mailer, &debug);
+      mu_mailer_get_debug (mailer, &debug);
       mu_debug_set_level (debug, MU_DEBUG_TRACE | MU_DEBUG_PROT);
@@ -233,12 +233,12 @@ main (int argc, char **argv)
     {
-      property_t property = NULL;
+      mu_property_t property = NULL;
 
-      mailer_get_property (mailer, &property);
-      property_set_value (property, "READ_RECIPIENTS", "true", 1);
+      mu_mailer_get_property (mailer, &property);
+      mu_property_set_value (property, "READ_RECIPIENTS", "true", 1);
     }
   
-  if ((status = mailer_open (mailer, mailer_flags)))
+  if ((status = mu_mailer_open (mailer, mailer_flags)))
     {
       const char *url = NULL;
-      mailer_get_url_default (&url);
+      mu_mailer_get_url_default (&url);
       mu_error (_("Opening mailer `%s' failed: %s"),
@@ -248,3 +248,3 @@ main (int argc, char **argv)
 
-  if ((status = mailer_send_message (mailer, msg, from, to)))
+  if ((status = mu_mailer_send_message (mailer, msg, from, to)))
     {
@@ -254,3 +254,3 @@ main (int argc, char **argv)
 
-  if ((status = mailer_close (mailer)))
+  if ((status = mu_mailer_close (mailer)))
     {