bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed delete menu dialog, when unsent message is to be deleted to recyclebin

Browse Source
This commit is contained in:
Ianos Gnatiuc 2006-07-09 04:56:26 +00:00
parent 21d9467607
commit 76be356ebe
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
golded3/gecmfd.cpp
View File

@ -157,12 +157,7 @@ void Area::DelMsgs(GMsg* msg, bool force)
if ((areano != currno) && (areano >= 0)) if ((areano != currno) && (areano >= 0))
{ {
bool del = true; CopyMoveForward(true);
if(CFG->arearecyclebinask && (NO == MenuDelete.Run(NO, msg)))
del = false;
if (del) CopyMoveForward(true);
GFTRK(0); GFTRK(0);
return; return;
} }
@ -523,8 +518,10 @@ void CmfMsgs(GMsg* msg, bool torecycle)
// Handle unsent msgs // Handle unsent msgs
mode = cmf; mode = cmf;
if((cmf == MODE_MOVE) and (loadmode & GMSG_UNS_NOT_RCV) and (msg->attr.uns() and not msg->attr.rcv())) { if ((loadmode & GMSG_UNS_NOT_RCV) &&
((torecycle && CFG->arearecyclebinask) ||
((cmf == MODE_MOVE) && msg->attr.uns() && !msg->attr.rcv())))
{
// Axe the popup wait window // Axe the popup wait window
w_info(NULL); w_info(NULL);
@ -537,9 +534,13 @@ void CmfMsgs(GMsg* msg, bool torecycle)
// Ask if it should be deleted // Ask if it should be deleted
GMenuDelete MenuDelete; GMenuDelete MenuDelete;
switch(MenuDelete.Run(YES, msg)) { switch(MenuDelete.Run(YES, msg))
{
case YES: break; case YES: break;
case NO: mode = MODE_COPY; break; case NO:
if (torecycle) continue;
mode = MODE_COPY;
break;
default: loadmode &= ~GMSG_UNS_NOT_RCV; default: loadmode &= ~GMSG_UNS_NOT_RCV;
} }