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

3
cfgs/config/advanced.cfg
View File

@@ -432,9 +432,6 @@ AREAREPLYTO E-MAIL
// <echoid> // <echoid>
;AREAYOUWROTETO MY_MAILS ;AREAYOUWROTETO MY_MAILS
// AreaRecycleBin <area>
// If enabled, GoldEd will move deleted messages to <area>.
;AreaRecycleBin RECYCLE.BIN
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- STATUSLINE -- STATUSLINE

4
cfgs/config/advanced.rus
View File

@@ -433,10 +433,6 @@ AreaCopyTo ZZZ.MY.ARCHIVE
// <20> <20><>㯯<EFBFBD><E3AFAF> <20><><EFBFBD><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD> ࠡ<>⠥<EFBFBD> <20> <20><><EFBFBD>ᨨ 3.00.a5. // <20> <20><>㯯<EFBFBD><E3AFAF> <20><><EFBFBD><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD> ࠡ<>⠥<EFBFBD> <20> <20><><EFBFBD>ᨨ 3.00.a5.
AreaCopyAddId No AreaCopyAddId No
// AreaRecycleBin <area>
// <20><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20>㤠 GoldEd <20><>६<EFBFBD><E0A5AC><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>쬠 <20><><EFBFBD> 㤠<><E3A4A0><EFBFBD><EFBFBD><EFBFBD>.
;AreaRecycleBin RECYCLE.BIN
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

2
docs/notework.txt
View File

@@ -10,6 +10,8 @@ ______________________________________________________________________
Notes for GoldED+ 1.1.5, /snapshot/ Notes for GoldED+ 1.1.5, /snapshot/
______________________________________________________________________ ______________________________________________________________________
! Temporarily disabled the AreaRecycleBin.
! Rename macroses: ! Rename macroses:
@echopath to @areapath - path to echoarea base, @echopath to @areapath - path to echoarea base,
@echoname to @areaname - echoarea file name without path, @echoname to @areaname - echoarea file name without path,

2
golded3/gccfgg0.cpp
View File

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

17
golded3/gecmfd.cpp
View File

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