[git] Pinentry - branch, master, updated. pinentry-0.8.3-8-g556d305
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Jul 15 15:09:21 CEST 2013
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 556d305b970ed60ef1dc2718fcafbf3bea6b7fea (commit)
via 9b154c9f87abd3ea5df4b763c958e538b19d0904 (commit)
via 4d56651dd4ab2568f8adc7e4448bb1239dbdbfb0 (commit)
via d4feabe153b096db896dfe25bd1bf763d23123d7 (commit)
from 54b9b92c13a496a33868501dec893bc8d82b1a8d (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 556d305b970ed60ef1dc2718fcafbf3bea6b7fea
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 15 12:43:18 2013 +0000
Lower paste length limit to 300
This should be more then enough and avoids possible problems
with libassuan cmd line lenght or percent escaping etc.
* qt4/qsecurelineedit.cpp (insert): Lower paste limit
diff --git a/qt4/qsecurelineedit.cpp b/qt4/qsecurelineedit.cpp
index 3203433..9611bdb 100644
--- a/qt4/qsecurelineedit.cpp
+++ b/qt4/qsecurelineedit.cpp
@@ -1331,7 +1331,7 @@ void QSecureLineEdit::deselect()
void QSecureLineEdit::insert(const QString &newText)
{
if (!newText.isEmpty() && newText.at(0).isPrint()
- && newText.length() < 1024) {
+ && newText.length() < 300) {
insert( secqstring( newText.begin(), newText.end() ) );
}
}
commit 9b154c9f87abd3ea5df4b763c958e538b19d0904
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 15 10:48:15 2013 +0000
Limit paste length to 1023 characters
* qt4/qsecurelineedit.cpp (insert): Check for a maximum
length before allocation the secmem string.
diff --git a/qt4/qsecurelineedit.cpp b/qt4/qsecurelineedit.cpp
index 42c4987..3203433 100644
--- a/qt4/qsecurelineedit.cpp
+++ b/qt4/qsecurelineedit.cpp
@@ -1330,7 +1330,8 @@ void QSecureLineEdit::deselect()
* wanted. Defeats the purpose of the secmem implmentation */
void QSecureLineEdit::insert(const QString &newText)
{
- if (!newText.isEmpty() && newText.at(0).isPrint()) {
+ if (!newText.isEmpty() && newText.at(0).isPrint()
+ && newText.length() < 1024) {
insert( secqstring( newText.begin(), newText.end() ) );
}
}
commit 4d56651dd4ab2568f8adc7e4448bb1239dbdbfb0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 15 09:43:54 2013 +0000
Fix contextmenu support for pasting.
MOC ignores preprocessor definitions so we can not conditionally
declare SLOTS. So we now move the ifdefs in the definition and
always declare the SLOTS.
* qt4/qsecurelinedit.cpp (cut, copy, paste): Do nothing if
QT_NO_CLIPBOARD is defined.
* qt4/qsecurelinedit.h: Always declare cut, copy and paste slots
diff --git a/qt4/qsecurelineedit.cpp b/qt4/qsecurelineedit.cpp
index a04b176..42c4987 100644
--- a/qt4/qsecurelineedit.cpp
+++ b/qt4/qsecurelineedit.cpp
@@ -1430,7 +1430,6 @@ void QSecureLineEdit::setReadOnly(bool enable)
}
-#ifndef QT_NO_CLIPBOARD
/*!
Copies the selected text to the clipboard and deletes it, if there
is any, and if echoMode() is \l Normal.
@@ -1443,10 +1442,12 @@ void QSecureLineEdit::setReadOnly(bool enable)
void QSecureLineEdit::cut()
{
+#ifndef QT_NO_CLIPBOARD
if (hasSelectedText()) {
copy();
del();
}
+#endif
}
@@ -1459,8 +1460,10 @@ void QSecureLineEdit::cut()
void QSecureLineEdit::copy() const
{
+#ifndef QT_NO_CLIPBOARD
Q_D(const QSecureLineEdit);
d->copy();
+#endif
}
/*!
@@ -1476,6 +1479,7 @@ void QSecureLineEdit::copy() const
void QSecureLineEdit::paste()
{
+#ifndef QT_NO_CLIPBOARD
Q_D(QSecureLineEdit);
if(echoMode() == PasswordEchoOnEdit)
{
@@ -1485,8 +1489,10 @@ void QSecureLineEdit::paste()
d->resumePassword = true;
}
insert(QApplication::clipboard()->text(QClipboard::Clipboard));
+#endif
}
+#ifndef QT_NO_CLIPBOARD
void QSecureLineEditPrivate::copy(bool clipboard) const
{
Q_Q(const QSecureLineEdit);
diff --git a/qt4/qsecurelineedit.h b/qt4/qsecurelineedit.h
index 4afdbb2..fec77f6 100644
--- a/qt4/qsecurelineedit.h
+++ b/qt4/qsecurelineedit.h
@@ -200,11 +200,9 @@ public Q_SLOTS:
void selectAll();
void undo();
void redo();
-#ifndef QT_NO_CLIPBOARD
void cut();
void copy() const;
void paste();
-#endif
public:
void deselect();
commit d4feabe153b096db896dfe25bd1bf763d23123d7
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 15 08:59:51 2013 +0000
Remove check for RTL extensions
Our code does nothing RTL specific there anyway. And the
qt_use_rtl_extensions symbol has been removed.
* qt4/qsecurelinedit.cpp: Remove check for RTL extensions.
diff --git a/qt4/qsecurelineedit.cpp b/qt4/qsecurelineedit.cpp
index 4384574..a04b176 100644
--- a/qt4/qsecurelineedit.cpp
+++ b/qt4/qsecurelineedit.cpp
@@ -2578,10 +2578,6 @@ void QSecureLineEdit::contextMenuEvent(QContextMenuEvent *event)
delete menu;
}
-#if defined(Q_WS_WIN)
- extern bool qt_use_rtl_extensions;
-#endif
-
/*! This function creates the standard context menu which is shown
when the user clicks on the line edit with the right mouse
button. It is called from the default contextMenuEvent() handler.
@@ -2648,11 +2644,7 @@ QMenu *QSecureLineEdit::createStandardContextMenu()
}
#endif
-#if defined(Q_WS_WIN)
- if (!d->readOnly && qt_use_rtl_extensions) {
-#else
if (!d->readOnly) {
-#endif
popup->addSeparator();
//QUnicodeControlCharacterMenu *ctrlCharacterMenu = new QUnicodeControlCharacterMenu(this, popup);
//popup->addMenu(ctrlCharacterMenu);
-----------------------------------------------------------------------
Summary of changes:
qt4/qsecurelineedit.cpp | 19 +++++++++----------
qt4/qsecurelineedit.h | 2 --
2 files changed, 9 insertions(+), 12 deletions(-)
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list