tomb

commit 9b0364d34c069b3700aee9356298379ba74f573b
parent 9bcf530c0f77194a20a9add068d79b3f46931e6e
Author: Jaromil <jaromil@dyne.org>
Date:   Tue, 13 Jan 2015 10:42:38 +0100

preserve current GTK-2.0 theme when using pinentry-gtk-2 (fix #185)

Diffstat:
M
tomb
 | 
17
++++++++++++-----

1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/tomb b/tomb
@@ -384,15 +384,21 @@ EOF`
         # customized gtk2 dialog with a skull (if extras are installed)
         if _is_found "pinentry-gtk-2"; then
 
+            gtkrc=""
             [[ "$DISPLAY" = "" ]] || {
                 theme=/share/themes/tomb/gtk-2.0-key/gtkrc
                 for i in /usr/local /usr; do
                     [[ -r $i/$theme ]] && {
-                        gtkrc=$i/$theme
-                        break }
-                done }
-
-            output=`cat <<EOF | GTK2_RC_FILES="$gtkrc" pinentry-gtk-2
+                        gtkrc="$i/$theme"
+                        break
+                    }
+                done
+            }
+            [[ "$gtkrc" = "" ]] || {
+                gtkrc_old="$GTK2_RC_FILES"
+                export GTK2_RC_FILES="$gtkrc"
+            }
+            output=`cat <<EOF | pinentry-gtk-2
 OPTION ttyname=$TTY
 OPTION lc-ctype=$LANG
 SETTITLE $title
@@ -400,6 +406,7 @@ SETDESC $description
 SETPROMPT Password:
 GETPIN
 EOF`
+            [[ "$gtkrc" = "" ]] || export GTK2_RC_FILES="$gtkrc_old"
 
             # TODO QT4 customization of dialog
         elif _is_found "pinentry-qt4"; then