Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-10 23:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #303 from sargo-devel/master

Browse Source 
Added pinentry-qt5 support
This commit is contained in:
Jaromil 2018-01-29 09:38:47 +01:00 committed by GitHub
commit f4913e0744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tomb
View File

@ -377,7 +377,7 @@ ask_password() {
# Distributions have broken wrappers for pinentry: they do # Distributions have broken wrappers for pinentry: they do
# implement fallback, but they disrupt the output somehow. We are # implement fallback, but they disrupt the output somehow. We are
# better off relying on less intermediaries, so we implement our # better off relying on less intermediaries, so we implement our
# own fallback mechanisms. Pinentry supported: curses, gtk-2, qt4 # own fallback mechanisms. Pinentry supported: curses, gtk-2, qt4, qt5
# and x11. # and x11.
# make sure LANG is set, default to C # make sure LANG is set, default to C
@ -429,6 +429,19 @@ GETPIN
EOF` EOF`
[[ "$gtkrc" = "" ]] || export GTK2_RC_FILES="$gtkrc_old" [[ "$gtkrc" = "" ]] || export GTK2_RC_FILES="$gtkrc_old"
# TODO QT5 customization of dialog
elif _is_found "pinentry-qt5"; then
_verbose "using pinentry-qt5"
output=`cat <<EOF | pinentry-qt5
OPTION ttyname=$TTY
OPTION lc-ctype=$LANG
SETTITLE $title
SETDESC $description
SETPROMPT Password:
GETPIN
EOF`
# TODO QT4 customization of dialog # TODO QT4 customization of dialog
elif _is_found "pinentry-qt4"; then elif _is_found "pinentry-qt4"; then
_verbose "using pinentry-qt4" _verbose "using pinentry-qt4"