Index: libbalsa/mailbox_pop3.c
===================================================================
--- libbalsa/mailbox_pop3.c	(revision 7667)
+++ libbalsa/mailbox_pop3.c	(working copy)
@@ -288,8 +288,8 @@
 }
 
 struct PopDownloadMode {
-    FILE* (*open)(const char *path);
-    int (*close)(FILE *arg);
+    FILE* (*open_file)(const char *path);
+    int (*close_file)(FILE *arg);
 } pop_direct = {
     pop_direct_open,
     fclose
@@ -333,7 +333,7 @@
     switch(prc) {
     case POP_REQ_OK: 
 	{/* GError **err = va_arg(alist, GError**); */
-        fd->f  = fd->dm->open(fd->dest_path);
+        fd->f  = fd->dm->open_file(fd->dest_path);
         if(fd->f == NULL) {
             if(!*fd->err) {
                 g_set_error(fd->err, IMAP_ERROR, IMAP_POP_SAVE_ERROR,
@@ -388,7 +388,7 @@
 	}
 	break;
     case POP_REQ_DONE:
-            if(fd->dm->close(fd->f) != 0) {
+            if(fd->dm->close_file(fd->f) != 0) {
                 if(!*fd->err)
                     g_set_error(fd->err, IMAP_ERROR, IMAP_POP_SAVE_ERROR,
                                 _("Transferring POP message to %s failed."),
@@ -538,7 +538,7 @@
         libbalsa_mailbox_progress_notify(mailbox,
                                          LIBBALSA_NTFY_PROGRESS, i, msgcnt,
                                          "next message");
-        f = mode->open(dest_path);
+        f = mode->open_file(dest_path);
         if(!f) {
             libbalsa_information(LIBBALSA_INFORMATION_ERROR,
 			     _("POP3 error: cannot open %s for writing."), 
@@ -547,7 +547,7 @@
         }
         if(!pop_fetch_message_s(pop, i, dump_cb, f, &err)) 
             break;
-        if(mode->close(f) != 0) {
+        if(mode->close_file(f) != 0) {
             libbalsa_information(LIBBALSA_INFORMATION_ERROR,
 			     _("POP3 error: cannot close %s."), 
 			     dest_path);