diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:26:53 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:26:53 +0300 |
commit | 5dbc85eaaa1bd0a0fc11dd76a75ece2efe763df5 (patch) | |
tree | 9721fb7aced603adb10b9bb3f3beb3f8d5fba973 /src/ui/certimportwidget.c | |
parent | 95c527db1484f7758a180c6de051d0182c3b2e81 (diff) | |
parent | f99a9111170f2ff28383fd3172fdaf4b9a1ba069 (diff) |
Merge branch 'work/v1.6' into work/serious-unicode
# Conflicts:
# res/fonts/SmolEmoji-Regular.ttf
Diffstat (limited to 'src/ui/certimportwidget.c')
-rw-r--r-- | src/ui/certimportwidget.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ui/certimportwidget.c b/src/ui/certimportwidget.c index e121b4d0..6e818137 100644 --- a/src/ui/certimportwidget.c +++ b/src/ui/certimportwidget.c | |||
@@ -215,6 +215,14 @@ static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Even | |||
215 | return iTrue; | 215 | return iTrue; |
216 | } | 216 | } |
217 | } | 217 | } |
218 | if (isCommand_UserEvent(ev, "input.paste")) { | ||
219 | if (!tryImportFromClipboard_CertImportWidget_(d)) { | ||
220 | makeSimpleMessage_Widget(uiTextCaution_ColorEscape "${heading.certimport.pasted}", | ||
221 | "${dlg.certimport.notfound}"); | ||
222 | } | ||
223 | postRefresh_App(); | ||
224 | return iTrue; | ||
225 | } | ||
218 | if (isCommand_UserEvent(ev, "certimport.paste")) { | 226 | if (isCommand_UserEvent(ev, "certimport.paste")) { |
219 | tryImportFromClipboard_CertImportWidget_(d); | 227 | tryImportFromClipboard_CertImportWidget_(d); |
220 | return iTrue; | 228 | return iTrue; |