From 8a3bb640455cbc8927a55c7b512aa9bd1a0e8304 Mon Sep 17 00:00:00 2001
From: "Alexander S. Aganichev" <asa@eed.miee.ru>
Date: Sat, 11 Nov 2000 08:59:31 +0000
Subject: [PATCH] Fixed Internet gated message replying, changed layout for
 kludges in JAM

---
 docs/building.txt         | 12 ++++++------
 docs/notework.txt         |  6 ++++++
 golded3/gehdre.cpp        | 10 ++++++++--
 goldlib/gmb3/gmojamm3.cpp |  9 ++++++++-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/docs/building.txt b/docs/building.txt
index 67c1c72..10e51e3 100644
--- a/docs/building.txt
+++ b/docs/building.txt
@@ -1,5 +1,5 @@
 
-GoldED+ compilation how to
+GoldED+ compilation howto
 by Alexander Aganichev, 2:5020/201.58 <aaganichev@netscape.net>
 
 -------------------------------------------------------------------------------
@@ -11,10 +11,9 @@ To compile GoldED+ and utilities you'll need:
  - vi, emacs, or any other editor you like
  - beer or bear on your choice ;-)
 
---- MINGW32 ONLY ---
-Remove alloc.h from the $(include)/mingw32 to avoid unpredictable problems.
-Change arguments to sopen (to be `const char *' instead of `char *') and
-atexit (to be `void (func *)(void)' instead of `void (func *)()').
+--- MINGW ONLY ---
+Please consult this howto on installing MinGW over Cygwin:
+http://www.xraylith.wisc.edu/~khan/software/gnu-win32/mno-cygwin-howto.txt
 ------ COMMON ------
 
 First, edit GNUmakef.def for the preferrable compilation options.
@@ -23,7 +22,8 @@ Now go to golded3 and copy mygolded.__h to mygolded.h and adjust it for
 yourself (put your name, FTN address and e-mail). Goto root again.
 
 Exec 'make' (or `gmake' on BSD) and drink beer or play with bear until
-compilation in progress.
+compilation in progress. But better - help your wife (if you have one) or
+wives (if you have more :)) with home work ;-)
 
 ls bin/
 
diff --git a/docs/notework.txt b/docs/notework.txt
index d2be8da..c137a24 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -12,6 +12,12 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.4.7, November xx 2000
 ______________________________________________________________________
 
+- It was impossible to change To: field when replying to the Internet
+  gated message when lookup turned off. Fixed.
+
++ Via, Recd and Forwarded kludges now displayed in the bottom of
+  message in JAM areas.
+
 - Cut-n-paste Unicode clipboard under Windows NT now properly filled
   with Unicode version of control characters with the exception of CR,
   LF, tabulation. It's fun to copy kludges from GoldED+ to WordPad ;-)
diff --git a/golded3/gehdre.cpp b/golded3/gehdre.cpp
index 48460b5..26063c5 100644
--- a/golded3/gehdre.cpp
+++ b/golded3/gehdre.cpp
@@ -297,7 +297,9 @@ bool GMsgHeaderEdit::validate() {
     field* ftoaddr = get_field(id_to_addr);
     field* fsubj = get_field(id_subject);
     gsetaddr toname, toaddr, fromaddr, subj;
+    string orig_toname;
 
+    orig_toname = msg->to;
     toname.buf = current->buf; toname.update = false;
     toaddr.buf = ftoaddr->buf; toaddr.update = false;
     fromaddr.buf = ffromaddr->buf; fromaddr.update = false;
@@ -311,6 +313,10 @@ bool GMsgHeaderEdit::validate() {
     strsetsz(bot2, EDIT->HdrNodeLen());
     window.prints(1, EDIT->HdrNodePos(), C_HEADW, bot2);
 
+    // once we changed name invalidate realto
+    if(not strieql(orig_toname.c_str(), toname.buf))
+      *msg->realto = NUL;
+
     if(toname.update) current->update();
     if(toaddr.update) ftoaddr->update();
     if(fromaddr.update) ffromaddr->update();
@@ -452,8 +458,8 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view) {
         if(*AA->Internetgate().name)
           strcpy(msg->iaddr, to_name.c_str());
         else {
-          if(strlen(to_name.c_str()) > 34) {
-            strcpy(msg->to, *AA->Internetgate().name ? AA->Internetgate().name : "UUCP");
+          if(to_name.length() > 34) {
+            strcpy(msg->to, "UUCP");
             strcpy(msg->iaddr, to_name.c_str());
           }
           else
diff --git a/goldlib/gmb3/gmojamm3.cpp b/goldlib/gmb3/gmojamm3.cpp
index cb6cb6f..02f0032 100644
--- a/goldlib/gmb3/gmojamm3.cpp
+++ b/goldlib/gmb3/gmojamm3.cpp
@@ -238,7 +238,14 @@ int JamArea::load_message(int __mode, gmsg* __msg, JamHdr& __hdr) {
         break;
 
       case JAMSUB_FTSKLUDGE:
-        sprintf(_kludges+strlen(_kludges), "\001%s\r", _buf);
+        {
+          char *_kludgesx;
+          if(strneql(_buf, "Via ", 4) or strneql(_buf, "Recd", 4) or strneql(_buf, "Forwarded", 9))
+            _kludgesx = _kludges2;
+          else
+            _kludgesx = _kludges;
+          sprintf(_kludgesx+strlen(_kludgesx), "\001%s\r", _buf);
+        }
         // Not processed
         break;