No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / src / lib / send_problem_report_job.cc

diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index f0c34f590bca5f823dadabbfdc70863d9d5a84a1..3c0bc47aac58fba1fc5d87d4a108702c99b91528 100644 (file)
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,6 +26,8 @@
 #include "log.h"
 #include "version.h"
 #include "emailer.h"
+#include "environment_info.h"
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
@@ -71,6 +74,12 @@ SendProblemReportJob::run ()
 
        body += "Version: " + string (dcpomatic_version) + " " + string (dcpomatic_git_commit) + "\n\n";
 
+       BOOST_FOREACH (string i, environment_info ()) {
+               body += i + "\n";
+       }
+
+       body += "\n";
+
        if (_film) {
                body += "log head and tail:\n";
                body += "---<8----\n";
@@ -81,10 +90,14 @@ SendProblemReportJob::run ()
                add_file (body, "metadata.xml");
        }
 
-       Emailer emailer (_from, "carl@dcpomatic.com", "DCP-o-matic problem report", body);
-       emailer.send (shared_from_this ());
+       list<string> to;
+       to.push_back ("carl@dcpomatic.com");
+
+       Emailer emailer (_from, to, "DCP-o-matic problem report", body);
+       emailer.send ("main.carlh.net", 2525);
 
        set_progress (1);
+       set_state (FINISHED_OK);
 }
 
 void