New config file token: AKAMatchManually

golded3/gccfgg.cpp

@@ -687,6 +687,7 @@ CfgGed::CfgGed() {
   addressbookadd = YES;
   addresslookupfirst = false;
   akamatchfromto = NO;
+  akamatchmanually = false;
   areaautoid = AUTOID_LONG;
   areacopydirect = false;
   areacopyaddid = false;

golded3/gccfgg.h

@@ -39,6 +39,7 @@ const word CRC_AKAMATCHECHO     = 0xF0C1;
 const word CRC_AKAMATCHFROMTO   = 0xD8B9;
 const word CRC_AKAMATCHING      = 0x869A;
 const word CRC_AKAMATCHLOCAL    = 0x4AC4;
+const word CRC_AKAMATCHMANUALLY = 0x9F9C;
 const word CRC_AKAMATCHNET      = 0xFD6E;
 const word CRC_AREA             = 0x010B;
 const word CRC_AREAAUTOID       = 0x365D;

golded3/gccfgg0.cpp

@@ -192,6 +192,7 @@ SwitchA:
     case CRC_AKAMATCH         :  CfgAkamatch         ();  break;
     case CRC_AKAMATCHFROMTO   :  CfgAkamatchfromto   ();  break;
     case CRC_AKAMATCHING      :  CfgAkamatching      ();  break;
+    case CRC_AKAMATCHMANUALLY :  CfgAkamatchmanually ();  break;
     case CRC_AREAAUTOID       :  CfgAreaautoid       ();  break;
     case CRC_AREACFMREPLYTO   :  CfgAreacfmreplyto   ();  break;
     case CRC_AREACOPYADDID    :  CfgAreacopyaddid    ();  break;

golded3/gccfgg1.cpp

@@ -191,6 +191,13 @@ void CfgAkamatching() {
 
 //  ------------------------------------------------------------------
 
+void CfgAkamatchmanually()
+{
+  CFG->akamatchmanually = (0 != GetYesno(val));
+}
+
+//  ------------------------------------------------------------------
+
 void CfgArea() {
 
   AL.GetArea(val);

golded3/gcprot.h

@@ -42,6 +42,7 @@ void CfgAkamatchecho     ();
 void CfgAkamatchfromto   ();
 void CfgAkamatching      ();
 void CfgAkamatchlocal    ();
+void CfgAkamatchmanually ();
 void CfgAkamatchnet      ();
 void CfgArea             ();
 void CfgAreaautoid       ();

golded3/gecfgg.h

@@ -141,6 +141,7 @@ public:
   std::vector<gaka> aka;
   std::vector<AkaMatchG> akamatch;
   int         akamatchfromto;
+  bool        akamatchmanually;
   int         areaautoid;
   Echo        areacfmreplyto;
   bool        areacopydirect;

golded3/gepost.cpp

@@ -907,6 +907,8 @@ 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) {