From 446e58c3831bfbcd49cf2b61caed466ef528133e Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 22 Jan 2017 04:46:36 +0100
Subject: [PATCH] use the email address from eressea.ini in CR mailto

---
 conf/e2/config.xml | 4 ----
 conf/e3/config.xml | 4 ----
 conf/e4/config.xml | 4 ----
 src/creport.c      | 7 +++++--
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/conf/e2/config.xml b/conf/e2/config.xml
index 0441a46f6..9e32218da 100644
--- a/conf/e2/config.xml
+++ b/conf/e2/config.xml
@@ -53,10 +53,6 @@
   <xi:include href="config://default/names-ghouls.xml"/>
   <xi:include href="config://default/names-dragons.xml"/>
   <strings>
-    <string name="mailto">
-      <text locale="de">eressea-server@eressea.kn-bremen.de</text>
-      <text locale="en">eressea-server@eressea.kn-bremen.de</text>
-    </string>
     <string name="newbie_info_game">
       <text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
       ERESSEA 2 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden.</text>
diff --git a/conf/e3/config.xml b/conf/e3/config.xml
index c8c5dbb06..6a5b18b84 100644
--- a/conf/e3/config.xml
+++ b/conf/e3/config.xml
@@ -45,10 +45,6 @@
     <function name="wage" value="minimum_wage"/>
   </rules>
   <strings>
-    <string name="mailto">
-      <text locale="de">eressea-server@eressea.kn-bremen.de</text>
-      <text locale="en">eressea-server@eressea.kn-bremen.de</text>
-    </string>
     <string name="newbie_info_game">
       <text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
       ERESSEA 3 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden.</text>
diff --git a/conf/e4/config.xml b/conf/e4/config.xml
index b188f7d79..3209c8eed 100644
--- a/conf/e4/config.xml
+++ b/conf/e4/config.xml
@@ -46,10 +46,6 @@
     <function name="wage" value="minimum_wage"/>
   </rules>
   <strings>
-    <string name="mailto">
-      <text locale="de">eressea-server@eressea.kn-bremen.de</text>
-      <text locale="en">eressea-server@eressea.kn-bremen.de</text>
-    </string>
     <string name="newbie_info_game">
       <text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
       ERESSEA 4 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden.</text>
diff --git a/src/creport.c b/src/creport.c
index bd9c97ec6..34cff9de3 100644
--- a/src/creport.c
+++ b/src/creport.c
@@ -1475,7 +1475,7 @@ report_computer(const char *filename, report_context * ctx, const char *bom)
     faction *f = ctx->f;
     const char *prefix;
     region *r;
-    const char *mailto = LOC(f->locale, "mailto");
+    const char *mailto = config_get("game.email");
     const attrib *a;
     FILE *F = fopen(filename, "w");
     static const race *rc_human;
@@ -1510,8 +1510,11 @@ report_computer(const char *filename, report_context * ctx, const char *bom)
     fprintf(F, "%d;Zeitalter\n", era);
     fprintf(F, "\"%s\";Build\n", eressea_version());
     if (mailto != NULL) {
+        // char mailcmd[64];
+        // snprintf(mailcmd, sizeof(mailcmd), "%s %d, %s", game_name(), game_id(), LOC(f->locale, "mailcmd"));
+        const char * mailcmd = LOC(f->locale, "mailcmd");
         fprintf(F, "\"%s\";mailto\n", mailto);
-        fprintf(F, "\"%s\";mailcmd\n", LOC(f->locale, "mailcmd"));
+        fprintf(F, "\"%s\";mailcmd\n", mailcmd);
     }
 
     show_alliances_cr(F, f);