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

Temporarily disabled the AreaRecycleBin

Browse Source
This commit is contained in:
Ianos Gnatiuc
2005-11-02 19:45:03 +00:00
parent e008ad57ab
commit 96f90f194e
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
golded3/gccfgg0.cpp
View File

@@ -218,7 +218,9 @@ SwitchA:
case CRC_AREAPMSCANEXCL : CfgAreapmscanexcl (); break;
case CRC_AREAPMSCANINCL : CfgAreapmscanincl (); break;
case CRC_AREAREADONLY : CfgAreareadonly (); break;
#if defined(__INCLUDE_NEW_KEYWORDS__)
case CRC_AREARECYCLEBIN : CfgArearecyclebin (); break;
#endif
case CRC_AREARENAME : CfgArearename (); break;
case CRC_AREAREPLYDIRECT : CfgAreareplydirect (); break;
case CRC_AREAREPLYTO : CfgAreareplyto (); break;

17
golded3/gecmfd.cpp
View File

@@ -149,13 +149,16 @@ void Area::DelMsgs(GMsg* msg) {
GFTRK("DelMsgs");
int areano = AL.AreaEchoToNo(CFG->arearecyclebin);
int currno = AL.AreaIdToNo(CurrArea);
if ((areano != currno) && (areano >= 0))
if (CFG->arearecyclebin[0])
{
CopyMoveForward(true);
GFTRK(NULL);
return;
int areano = AL.AreaEchoToNo(CFG->arearecyclebin);
int currno = AL.AreaIdToNo(CurrArea);
if ((areano != currno) && (areano >= 0))
{
CopyMoveForward(true);
GFTRK(NULL);
return;
}
}
uint n, x;
@@ -420,7 +423,7 @@ void CmfMsgs(GMsg* msg, bool torecycle)
destarea = AL.AreaNoToId(a);
}
if (torecycle || (cmf == MODE_FORWARD ? not AA->Areaforwarddirect() : not AA->Areacopydirect()))
if (cmf == MODE_FORWARD ? not AA->Areaforwarddirect() : not AA->Areacopydirect())
destarea = AreaPick(pickstr, 6, &destarea);
if(destarea == -1) {