Normalize global namespace. Part 2

3 files changed, 17 insertions, 17 deletions

diff --git a/guimb/collect.c b/guimb/collect.c
index 0fd3d6163..639f0e536 100644
--- a/guimb/collect.c
+++ b/guimb/collect.c
@@ -20,7 +20,7 @@
 
 char *temp_filename;
 FILE *temp_file;
-mailbox_t mbox;
+mu_mailbox_t mbox;
 
 void
 collect_open_default ()
@@ -132,7 +132,7 @@ int
 collect_output ()
 {
   size_t i, count = 0;
-  mailbox_t outbox = NULL;
+  mu_mailbox_t outbox = NULL;
   int saved_umask;
 
   if (!temp_filename)
@@ -156,11 +156,11 @@ collect_output ()
   mu_mailbox_messages_count (mbox, &count);
   for (i = 1; i <= count; i++)
     {
-      message_t msg = NULL;
-      attribute_t attr = NULL;
+      mu_message_t msg = NULL;
+      mu_attribute_t attr = NULL;
 
       mu_mailbox_get_message (mbox, i, &msg);
-      message_get_attribute (msg, &attr);
+      mu_message_get_attribute (msg, &attr);
       if (!mu_attribute_is_deleted (attr))
 	{
 	  mu_attribute_set_recent (attr);
@@ -191,7 +191,7 @@ collect_drop_mailbox ()
 }
 
 SCM
-guimb_catch_body (void *data, mailbox_t unused)
+guimb_catch_body (void *data, mu_mailbox_t unused)
 {
   struct guimb_data *gd = data;
   if (gd->program_file)
@@ -211,7 +211,7 @@ guimb_catch_handler (void *unused, SCM tag, SCM throw_args)
 }
 
 int
-guimb_exit (void *unused1, mailbox_t unused2)
+guimb_exit (void *unused1, mu_mailbox_t unused2)
 {
   int rc = collect_output ();
   collect_drop_mailbox ();
diff --git a/guimb/guimb.h b/guimb/guimb.h
index 1ffea68f9..d11e91394 100644
--- a/guimb/guimb.h
+++ b/guimb/guimb.h
@@ -51,10 +51,10 @@ extern char *program_file;
 extern char *program_expr;
 extern char *user_name;
 extern char *default_mailbox;
-extern mailbox_t mbox;
+extern mu_mailbox_t mbox;
 extern size_t nmesg;
 extern size_t current_mesg_no;
-extern message_t current_message;
+extern mu_message_t current_message;
 extern int debug_guile;
 extern char *maildir;
 
@@ -74,6 +74,6 @@ struct guimb_data
   char *program_expr;
 };
 
-SCM guimb_catch_body (void *data, mailbox_t unused);
+SCM guimb_catch_body (void *data, mu_mailbox_t unused);
 SCM guimb_catch_handler (void *unused, SCM tag, SCM throw_args);
-int guimb_exit (void *unused1, mailbox_t unused2);
+int guimb_exit (void *unused1, mu_mailbox_t unused2);
diff --git a/guimb/util.c b/guimb/util.c
index 56afb73fb..689ffe6c9 100644
--- a/guimb/util.c
+++ b/guimb/util.c
@@ -33,18 +33,18 @@ util_error (char *fmt, ...)
 char *
 util_get_sender (int msgno)
 {
-  header_t header = NULL;
-  address_t addr = NULL;
-  message_t msg = NULL;
+  mu_header_t header = NULL;
+  mu_address_t addr = NULL;
+  mu_message_t msg = NULL;
   char buffer[512];
 
   mu_mailbox_get_message (mbox, msgno, &msg);
-  message_get_header (msg, &header);
+  mu_message_get_header (msg, &header);
   if (mu_header_get_value (header, MU_HEADER_FROM, buffer, sizeof (buffer), NULL)
       || mu_address_create (&addr, buffer))
     {
-      envelope_t env = NULL;
-      message_get_envelope (msg, &env);
+      mu_envelope_t env = NULL;
+      mu_message_get_envelope (msg, &env);
       if (mu_envelope_sender (env, buffer, sizeof (buffer), NULL)
 	  || mu_address_create (&addr, buffer))
 	{