From 5e7ba9814687e19c16e9b28430b8d672c6a05389 Mon Sep 17 00:00:00 2001
From: Ianos Gnatiuc <ssianky@users.sourceforge.net>
Date: Tue, 26 Dec 2006 02:05:24 +0000
Subject: [PATCH] ReplyLink config keyword can be 'none' now - do not link

---
 cfgs/config/advanced.cfg |  1 +
 cfgs/config/advanced.rus |  1 +
 docs/notework.rus        |  1 +
 docs/notework.txt        |  2 ++
 golded3/gccfgg7.cpp      | 10 ++++++----
 golded3/gepost.cpp       | 16 +++++++++++-----
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/cfgs/config/advanced.cfg b/cfgs/config/advanced.cfg
index e2f71df..b1df130 100644
--- a/cfgs/config/advanced.cfg
+++ b/cfgs/config/advanced.cfg
@@ -685,6 +685,7 @@ QUOTESTRING " FL> "
 -- REPLYLINKING
 
 // How to do replylinking when replying.
+;REPLYLINK None   ; Don't link.
 ;REPLYLINK Chain  ; Link to last msg in a subject-based reply chain.
 REPLYLINK Direct  ; Link directly to the original message.
 
diff --git a/cfgs/config/advanced.rus b/cfgs/config/advanced.rus
index b561c61..e5f755e 100644
--- a/cfgs/config/advanced.rus
+++ b/cfgs/config/advanced.rus
@@ -786,6 +786,7 @@ QuoteBufMode Ask                 ; 
 
 // Как строить цепочку при ответах.
 // По умолчанию Direct.
+;ReplyLink None   ; Не линковать.
 ;ReplyLink Chain  ; Линковать к последнему сообщению, для линковки по "Subj:".
 ReplyLink Direct  ; Линковать напрямую к оригиналу.
 
diff --git a/docs/notework.rus b/docs/notework.rus
index 17f25ff..0092c39 100644
--- a/docs/notework.rus
+++ b/docs/notework.rus
@@ -10,6 +10,7 @@ _____________________________________________________________________________
                Заметки для GoldED+ 1.1.5, /snapshot/
 _____________________________________________________________________________
 
++ ReplyLink может принимать значение "none" - не линковать.
 - Исправлено заедание в дереве ответов, если нажать ESC в треде.
 - uudecoder: теперь будет проигнорировано все после строк по маске
   "sum -r/size [0-9]+/[0-9]+ section.*" или "section [0-9]+ end.*"
diff --git a/docs/notework.txt b/docs/notework.txt
index c991928..2aa7005 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -10,6 +10,8 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
++ ReplyLink config keyword can be "none" now - do not link.
+
 - Fixed thread lock if ESC is pressed in thread list.
 
 - uudecoder: now are skipped all lines which follows lines with mask
diff --git a/golded3/gccfgg7.cpp b/golded3/gccfgg7.cpp
index 53c764e..c6a817d 100644
--- a/golded3/gccfgg7.cpp
+++ b/golded3/gccfgg7.cpp
@@ -175,11 +175,13 @@ void CfgRa2usersbbs() {
 
 //  ------------------------------------------------------------------
 
-void CfgReplylink() {
-
-  if(strieql(val, "Chain"))
+void CfgReplylink()
+{
+  if (strieql(val, "none"))
+    CFG->replylink = REPLYLINK_NONE;
+  if (strieql(val, "chain"))
     CFG->replylink = REPLYLINK_CHAIN;
-  else if(strieql(val, "Direct"))
+  else if(strieql(val, "direct"))
     CFG->replylink = REPLYLINK_DIRECT;
 }
 
diff --git a/golded3/gepost.cpp b/golded3/gepost.cpp
index 64cd4c7..7cef54e 100644
--- a/golded3/gepost.cpp
+++ b/golded3/gepost.cpp
@@ -996,11 +996,17 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
             if(*msg->references == NUL)
               throw_release(msg->references);
           }
-          if(CurrArea == OrigArea) {
-            if((CFG->replylink == REPLYLINK_DIRECT) or streql(AA->basetype(), "JAM"))
-              reply_msgno = omsg->msgno;
-            else if(CFG->replylink == REPLYLINK_CHAIN)
-              GetLastLink(omsg, reply_msgno);
+
+          if (CurrArea == OrigArea)
+          {
+            if (CFG->replylink != REPLYLINK_NONE)
+            {
+              if ((CFG->replylink == REPLYLINK_DIRECT) or streql(AA->basetype(), "JAM"))
+                reply_msgno = omsg->msgno;
+              else if (CFG->replylink == REPLYLINK_CHAIN)
+                GetLastLink(omsg, reply_msgno);
+            }
+
             msg->link.to_set(reply_msgno);
             if(msg->link.to() == omsg->msgno)
               omsg->link.first_set(msg->msgno);