projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
pop
/
pop.c
diff --git
a/pop/pop.c
b/pop/pop.c
index
01f8e93
..
804fec2
100644
(file)
--- a/
pop/pop.c
+++ b/
pop/pop.c
@@
-15,6
+15,7
@@
#include "mx.h"
#include "pop.h"
#include "mutt_crypt.h"
#include "mx.h"
#include "pop.h"
#include "mutt_crypt.h"
+#include "mutt_curses.h"
#include "lib/mem.h"
#include "lib/str.h"
#include "lib/mem.h"
#include "lib/str.h"
@@
-106,6
+107,11
@@
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
{
mutt_error _("Can't write header to temporary file!");
{
mutt_error _("Can't write header to temporary file!");
+ break;
+ }
+ case PQ_NOT_CONNECTED:
+ {
+ mutt_error _("Can't fetch header: Not connected!");
break;
}
}
break;
}
}
@@
-321,7
+327,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
void *uidl;
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
void *uidl;
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
-
char *m = _("Fetching message...")
;
+
progress_t bar
;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
POP_CACHE *cache;
HEADER *h = ctx->hdrs[msgno];
POP_DATA *pop_data = (POP_DATA *) ctx->data;
POP_CACHE *cache;
HEADER *h = ctx->hdrs[msgno];
@@
-359,7
+365,9
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
return -1;
}
return -1;
}
- mutt_message (m);
+ bar.size = h->content->length + h->content->offset - 1;
+ bar.msg = _("Fetching message...");
+ mutt_progress_bar (&bar, 0);
mutt_mktemp (path);
msg->fp = safe_fopen (path, "w+");
mutt_mktemp (path);
msg->fp = safe_fopen (path, "w+");
@@
-371,7
+379,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
snprintf (buf, sizeof (buf), "RETR %d\r\n", h->refno);
snprintf (buf, sizeof (buf), "RETR %d\r\n", h->refno);
- ret = pop_fetch_data (pop_data, buf,
m
, fetch_message, msg->fp);
+ ret = pop_fetch_data (pop_data, buf,
&bar
, fetch_message, msg->fp);
if (ret == PQ_OK)
break;
if (ret == PQ_OK)
break;