From b417527631cf368367cee54ec26dee70ca8016da Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Thu, 27 Oct 2005 17:21:15 +0000
Subject: [PATCH] Replace "golded.cfg" with GEDCFG

---
 golded3/gccfgg.cpp |  2 +-
 golded3/geinit.cpp | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/golded3/gccfgg.cpp b/golded3/gccfgg.cpp
index 78b46c6..a2273b5 100644
--- a/golded3/gccfgg.cpp
+++ b/golded3/gccfgg.cpp
@@ -551,7 +551,7 @@ GoldedCfgEdit::GoldedCfgEdit() {
 CfgGed::CfgGed() {
 
   // pathes
-  strcpy(goldcfg, "golded.cfg");
+  strcpy(goldcfg, GEDCFG);
   strcpy(helpcfg.fn, "goldhelp.cfg"); helpcfg.ft = 0;
   replaceextension(helpged, helpcfg.fn, __gver_cfgext__);
   strcpy(keyscfg, "goldkeys.cfg");
diff --git a/golded3/geinit.cpp b/golded3/geinit.cpp
index 24af733..673aee7 100644
--- a/golded3/geinit.cpp
+++ b/golded3/geinit.cpp
@@ -455,13 +455,6 @@ static bool FindCfg(char* path) {
       return false;
   }
   AddBackslash(path);
-#if 0
-  #if defined(__OS2__)
-  found = ExistCfg(path, "ged2.cfg");
-  #elif defined(__WIN32__)
-  found = ExistCfg(path, "gedw32.cfg");
-  #endif
-#endif
   #ifdef GEDCFG2
   found = ExistCfg(path, GEDCFG2);
   #endif
@@ -637,14 +630,14 @@ void Initialize(int argc, char* argv[]) {
       found = FindCfg(cmdlinecfg);
     }
 
-    // Get it where the the .EXE file is
+    // Get it where the the binary file is
     if(not found) {
       extractdirname(cmdlinecfg, argv[0]);
       found = FindCfg(cmdlinecfg);
 
       // If we still could not find config name...
       if(not found)
-        strcat(cmdlinecfg, "golded.cfg");
+        strcat(cmdlinecfg, GEDCFG);
     }
   }
   extractdirname(CFG->goldpath, cmdlinecfg);