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

Placed AKAMatchManually after all aka matching logic

Browse Source
This commit is contained in:
Ianos Gnatiuc 2005-12-31 10:40:53 +00:00
parent 3083762d4c
commit 78255de531
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/notework.txt
View File

@ -10,6 +10,8 @@ ______________________________________________________________________
Notes for GoldED+ 1.1.5, /snapshot/ Notes for GoldED+ 1.1.5, /snapshot/
______________________________________________________________________ ______________________________________________________________________
- Placed AKAMatchManually after all aka matching logic.
- Fixed buffer overun for too wide menus. - Fixed buffer overun for too wide menus.
+ Added new config file token: XlatCharSetAlias "charset" "alias1" "alias2"... + Added new config file token: XlatCharSetAlias "charset" "alias1" "alias2"...

13
golded3/gehdre.cpp
View File

@ -607,11 +607,20 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view, bool doedithdr) {
if(AA->Aka().addr.equals(AA->aka())) { if(AA->Aka().addr.equals(AA->aka())) {
// Do aka matching // Do aka matching
if(AA->Akamatching()) { if(AA->Akamatching())
strcpy(msg->odom, CFG->aka[AkaMatch(&msg->orig, &msg->dest)].domain); {
AkaMatch(&msg->orig, &msg->dest);
AA->SetAka(msg->orig);
} }
} }
} }
if (AA->Akamatching())
{
if (CFG->akamatchmanually) ChangeAka();
msg->orig = AA->Aka().addr;
strcpy(msg->odom, AA->Aka().domain);
}
} }
} }
} }

5
golded3/gepost.cpp
View File

@ -907,8 +907,6 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
AkaMatch(&aka_addr, &omsg->orig); AkaMatch(&aka_addr, &omsg->orig);
AA->SetAka(aka_addr); AA->SetAka(aka_addr);
} }
if (CFG->akamatchmanually) ChangeAka();
} }
if((mode == MODE_REPLYCOMMENT) and not omsg->fwdorig.net) { if((mode == MODE_REPLYCOMMENT) and not omsg->fwdorig.net) {
@ -1049,9 +1047,6 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
strcpy(msg->to, ""); strcpy(msg->to, "");
msg->dest.reset_fast(); msg->dest.reset_fast();
msg->odest.reset_fast(); msg->odest.reset_fast();
if (AA->Akamatching() && CFG->akamatchmanually)
ChangeAka();
} }
if(not AA->isnet() or (AA->isemail() and strchr(AA->Whoto(), '@'))) if(not AA->isnet() or (AA->isemail() and strchr(AA->Whoto(), '@')))
strcpy(msg->to, AA->Whoto()); strcpy(msg->to, AA->Whoto());