summaryrefslogtreecommitdiff
path: root/src/wx/config_dialog.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-01-07 00:02:00 +0000
committerCarl Hetherington <cth@carlh.net>2018-01-07 00:02:00 +0000
commit1da6ec96a4cdb4915c394bd4c272b6bfcc2033c8 (patch)
treef9ca86522ac72599178745e43251f29560c5d61d /src/wx/config_dialog.h
parent4042c59cd8a1007e0d8f1959569bf2699bdfbe8b (diff)
Make certificate re-creation cancellable and default nags
to not going away (#1158).
Diffstat (limited to 'src/wx/config_dialog.h')
-rw-r--r--src/wx/config_dialog.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 9a73d4e61..b76f8bc35 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -120,7 +120,7 @@ public:
int border,
boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> set,
boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> get,
- boost::function<void (void)> nag_remake
+ boost::function<bool (void)> nag_remake
);
void add_button (wxWindow* button);
@@ -149,7 +149,7 @@ private:
wxBoxSizer* _button_sizer;
boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> _set;
boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> _get;
- boost::function<void (void)> _nag_remake;
+ boost::function<bool (void)> _nag_remake;
};
class KeysPage : public StandardPage
@@ -176,7 +176,7 @@ private:
void export_decryption_certificate ();
void export_decryption_chain ();
void config_changed () {}
- void nag_remake_decryption_chain ();
+ bool nag_remake_decryption_chain ();
void decryption_advanced ();
void signing_advanced ();
void export_decryption_chain_and_key ();