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