Add a load of explicit keywords.

[dcpomatic.git] / src / wx / screen_dialog.cc

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 5afb50a2a3a7bb5b61688a0606b183f9818390ae..c7684d77fbad025a9ac845a0cb9bc0ddd1dd8c8e 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2016 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/>.
 
 */
 
@@ -24,6 +25,7 @@
 #include "lib/compose.hpp"
 #include "lib/util.h"
 #include <dcp/exceptions.h>
+#include <dcp/certificate_chain.h>
 #include <wx/filepicker.h>
 #include <wx/validate.h>
 #include <iostream>
@@ -43,7 +45,7 @@ column (dcp::Certificate c)
 class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
 {
 public:
-       CertificateFileDialogWrapper (wxWindow* parent)
+       explicit CertificateFileDialogWrapper (wxWindow* parent)
                : FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
        {
 
@@ -103,7 +105,6 @@ ScreenDialog::ScreenDialog (
                columns,
                bind (&ScreenDialog::trusted_devices, this),
                bind (&ScreenDialog::set_trusted_devices, this, _1),
-               bind (&always_valid),
                bind (&column, _1),
                false
                );
@@ -111,9 +112,9 @@ ScreenDialog::ScreenDialog (
        _sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
        ++r;
 
-       _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreenDialog::setup_sensitivity, this));
-       _get_recipient_from_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::get_recipient_from_file, this));
-       _download_recipient->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::download_recipient, this));
+       _name->Bind (wxEVT_TEXT, boost::bind (&ScreenDialog::setup_sensitivity, this));
+       _get_recipient_from_file->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::get_recipient_from_file, this));
+       _download_recipient->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::download_recipient, this));
 
        overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
@@ -150,9 +151,11 @@ void
 ScreenDialog::load_recipient (boost::filesystem::path file)
 {
        try {
-               set_recipient (dcp::Certificate (dcp::file_to_string (file)));
+               /* Load this as a chain, in case it is one, and then pick the leaf certificate */
+               dcp::CertificateChain c (dcp::file_to_string (file));
+               set_recipient (c.leaf ());
        } catch (dcp::MiscError& e) {
-               error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data()));
+               error_dialog (this, wxString::Format (_("Could not read certificate file.")), std_to_wx(e.what()));
        }
 }