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]
/
curs_lib.c
diff --git
a/curs_lib.c
b/curs_lib.c
index
9856b2d
..
e73d4f5
100644
(file)
--- a/
curs_lib.c
+++ b/
curs_lib.c
@@
-310,7
+310,7
@@
void mutt_curses_error (const char *fmt, ...)
set_option (OPTMSGERR);
}
set_option (OPTMSGERR);
}
-#ifdef USE
R
_SOCKET
+#ifdef USE_SOCKET
void mutt_progress_bar (progress_t* progress, long pos) {
char posstr[SHORT_STRING];
void mutt_progress_bar (progress_t* progress, long pos) {
char posstr[SHORT_STRING];
@@
-318,8
+318,9
@@
void mutt_progress_bar (progress_t* progress, long pos) {
if (!NetInc)
mutt_message (progress->msg);
else {
if (!NetInc)
mutt_message (progress->msg);
else {
- mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr),
- progress->size);
+ if (progress->size)
+ mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr),
+ progress->size);
progress->pos = 0;
}
}
progress->pos = 0;
}
}
@@
-327,11
+328,14
@@
void mutt_progress_bar (progress_t* progress, long pos) {
if (!NetInc)
return;
if (!NetInc)
return;
- if (pos > progress->pos + (NetInc << 10)) {
+ if (pos >
=
progress->pos + (NetInc << 10)) {
progress->pos = pos;
pos = pos / (NetInc << 10) * (NetInc << 10);
mutt_pretty_size (posstr, sizeof (posstr), pos);
progress->pos = pos;
pos = pos / (NetInc << 10) * (NetInc << 10);
mutt_pretty_size (posstr, sizeof (posstr), pos);
- mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr);
+ if (progress->size)
+ mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr);
+ else
+ mutt_message ("%s %s", progress->msg, posstr);
}
}
#endif
}
}
#endif