diff --git a/cfgs/config/advanced.cfg b/cfgs/config/advanced.cfg index da9148e..c24b46f 100644 --- a/cfgs/config/advanced.cfg +++ b/cfgs/config/advanced.cfg @@ -432,9 +432,6 @@ AREAREPLYTO E-MAIL // ;AREAYOUWROTETO MY_MAILS -// AreaRecycleBin -// If enabled, GoldEd will move deleted messages to . -;AreaRecycleBin RECYCLE.BIN ---------------------------------------------------------------------- -- STATUSLINE diff --git a/cfgs/config/advanced.rus b/cfgs/config/advanced.rus index a03be10..6ffefec 100644 --- a/cfgs/config/advanced.rus +++ b/cfgs/config/advanced.rus @@ -433,10 +433,6 @@ AreaCopyTo ZZZ.MY.ARCHIVE // В группах этот параметр работает с версии 3.00.a5. AreaCopyAddId No -// AreaRecycleBin -// Установка области, куда GoldEd переместит письма при удалении. -;AreaRecycleBin RECYCLE.BIN - ---------------------------------------------------------------------- -- СТРОКА СОСТОЯНИЯ diff --git a/docs/notework.txt b/docs/notework.txt index 9ccc87f..1b90666 100644 --- a/docs/notework.txt +++ b/docs/notework.txt @@ -10,6 +10,8 @@ ______________________________________________________________________ Notes for GoldED+ 1.1.5, /snapshot/ ______________________________________________________________________ +! Temporarily disabled the AreaRecycleBin. + ! Rename macroses: @echopath to @areapath - path to echoarea base, @echoname to @areaname - echoarea file name without path, diff --git a/golded3/gccfgg0.cpp b/golded3/gccfgg0.cpp index 54cd26ae..91d465a 100644 --- a/golded3/gccfgg0.cpp +++ b/golded3/gccfgg0.cpp @@ -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; diff --git a/golded3/gecmfd.cpp b/golded3/gecmfd.cpp index 8d540a6..54c15f0 100644 --- a/golded3/gecmfd.cpp +++ b/golded3/gecmfd.cpp @@ -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) {