Placed AKAMatchManually after all aka matching logic
This commit is contained in:
parent
3083762d4c
commit
78255de531
@ -10,6 +10,8 @@ ______________________________________________________________________
|
||||
Notes for GoldED+ 1.1.5, /snapshot/
|
||||
______________________________________________________________________
|
||||
|
||||
- Placed AKAMatchManually after all aka matching logic.
|
||||
|
||||
- Fixed buffer overun for too wide menus.
|
||||
|
||||
+ Added new config file token: XlatCharSetAlias "charset" "alias1" "alias2"...
|
||||
|
@ -607,11 +607,20 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view, bool doedithdr) {
|
||||
if(AA->Aka().addr.equals(AA->aka())) {
|
||||
|
||||
// Do aka matching
|
||||
if(AA->Akamatching()) {
|
||||
strcpy(msg->odom, CFG->aka[AkaMatch(&msg->orig, &msg->dest)].domain);
|
||||
if(AA->Akamatching())
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -907,8 +907,6 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
|
||||
AkaMatch(&aka_addr, &omsg->orig);
|
||||
AA->SetAka(aka_addr);
|
||||
}
|
||||
|
||||
if (CFG->akamatchmanually) ChangeAka();
|
||||
}
|
||||
|
||||
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, "");
|
||||
msg->dest.reset_fast();
|
||||
msg->odest.reset_fast();
|
||||
|
||||
if (AA->Akamatching() && CFG->akamatchmanually)
|
||||
ChangeAka();
|
||||
}
|
||||
if(not AA->isnet() or (AA->isemail() and strchr(AA->Whoto(), '@')))
|
||||
strcpy(msg->to, AA->Whoto());
|
||||
|
Reference in New Issue
Block a user