o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove elsewhere-deleted messages from window; Refresh -> Get

Browse source
This commit is contained in:
rsc 2007-06-23 06:27:38 +00:00
parent 7cc0e47fa8
commit 313c365a29
2 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/cmd/acme/mail/mail.c
View file

@ -327,6 +327,7 @@ delmesg(char *name, char *digest, int dodel, char *save)
if(dodel) if(dodel)
mesgmenumarkdel(wbox, &mbox, m, 1); mesgmenumarkdel(wbox, &mbox, m, 1);
else{ else{
fprint(2, "message is gone...\n");
/* notification came from plumber - message is gone */ /* notification came from plumber - message is gone */
mesgmenudel(wbox, &mbox, m); mesgmenudel(wbox, &mbox, m);
if(!m->opened) if(!m->opened)
@ -443,21 +444,6 @@ mboxcommand(Window *w, char *s)
return 1; return 1;
} }
if(strcmp(s, "Get") == 0){ if(strcmp(s, "Get") == 0){
if(mbox.dirty){
mbox.dirty = 0;
fprint(2, "mail: mailbox not written\n");
return 1;
}
winsetaddr(w, ",", 1);
if(w->data == nil)
w->data = winopenfile(w, "data");
fswrite(w->data, "", 0);
mesgmenu(wbox, &mbox);
winclean(wbox);
fswrite(mbox.ctlfd, "refresh", 7);
return 1;
}
if(strcmp(s, "Refresh") == 0){
fswrite(mbox.ctlfd, "refresh", 7); fswrite(mbox.ctlfd, "refresh", 7);
return 1; return 1;
} }

2
src/cmd/acme/mail/mesg.c
View file

@ -561,7 +561,7 @@ mesgmenudel(Window *w, Message *mbox, Message *m)
if(w->data ==nil) if(w->data ==nil)
w->data = winopenfile(w, "data"); w->data = winopenfile(w, "data");
buf = name2regexp(deletedrx, m->name); buf = name2regexp(deletedrx01, m->name);
if(winsetaddr(w, buf, 1) && winsetaddr(w, ".,./.*\\n(\t.*\\n)*/", 1)) if(winsetaddr(w, buf, 1) && winsetaddr(w, ".,./.*\\n(\t.*\\n)*/", 1))
fswrite(w->data, "", 0); fswrite(w->data, "", 0);
free(buf); free(buf);