[git] Pinentry - branch, master, updated. pinentry-0.9.7-25-g300755c

by Andre Heinecke cvs at cvs.gnupg.org
Fri Aug 12 13:12:03 CEST 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".

The branch, master has been updated
       via  300755c1a10eec1f8bccd4182ed15c569473982c (commit)
      from  c71ba9a57c0a4e3f919d90ea181ba7313d9533aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 300755c1a10eec1f8bccd4182ed15c569473982c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Aug 12 13:07:54 2016 +0200

    Qt: Disable automatic wrap for desc and errors
    
    * qt/pinentrydialog.cpp (PinEntryDialog): Disable WordWrap.
    
    --
    The agent already sends line breaks which should be respected.
    This fixes the problem that pinentry-qt would break ssh fingerprints
    because it treated the colon as a breakable character.
    
    GnuPG's translators and GnuPG itself should take care how descriptions
    and errors should be formatted.

diff --git a/qt/pinentrydialog.cpp b/qt/pinentrydialog.cpp
index 11a157c..009cd31 100644
--- a/qt/pinentrydialog.cpp
+++ b/qt/pinentrydialog.cpp
@@ -135,14 +135,12 @@ PinEntryDialog::PinEntryDialog(QWidget *parent, const char *name,
     _icon->setPixmap(icon());
 
     _error = new QLabel(this);
-    _error->setWordWrap(true);
     QPalette pal;
     pal.setColor(QPalette::WindowText, Qt::red);
     _error->setPalette(pal);
     _error->hide();
 
     _desc = new QLabel(this);
-    _desc->setWordWrap(true);
     _desc->hide();
 
     _prompt = new QLabel(this);

-----------------------------------------------------------------------

Summary of changes:
 qt/pinentrydialog.cpp | 2 --
 1 file changed, 2 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org




More information about the Gnupg-commits mailing list