aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-10-23 20:59:50 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-10-23 20:59:50 +0000
commita7fe86aeef32ac8a7c8ab8f64dfde2e5124a7ca8 (patch)
tree5008271197962e608e132bc8f0cc0550ef8d4f7e
parentchanged to GPLv3 (diff)
downloadgpg4usb-a7fe86aeef32ac8a7c8ab8f64dfde2e5124a7ca8.tar.gz
gpg4usb-a7fe86aeef32ac8a7c8ab8f64dfde2e5124a7ca8.zip
verifydetaildialog doesn't crash anymore
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@565 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--gpg4usb.pro13
-rw-r--r--keylist.cpp2
-rw-r--r--verifydetailsdialog.cpp8
3 files changed, 15 insertions, 8 deletions
diff --git a/gpg4usb.pro b/gpg4usb.pro
index b755a1f..dc3a698 100644
--- a/gpg4usb.pro
+++ b/gpg4usb.pro
@@ -11,8 +11,8 @@ DEPENDPATH += .
INCLUDEPATH += . \
./include
-# CONFIG += release static
-CONFIG += debug
+CONFIG += release static
+#CONFIG += debug
QT += network
# Input
HEADERS += attachments.h \
@@ -55,8 +55,13 @@ SOURCES += attachments.cpp \
RC_FILE = gpg4usb.rc
# comment out line below for static building
-LIBS += -lgpgme \
- -lgpg-error
+#LIBS += -lgpgme \
+# -lgpg-error \
+
+INCLUDEPATH += ./winbuild/include
+LIBS +=./winbuild/lib/libgpgme.a ./winbuild/lib/libgpg-error.a
+
+
DEFINES += _FILE_OFFSET_BITS=64
TRANSLATIONS = release/ts/gpg4usb_en.ts \
release/ts/gpg4usb_de.ts \
diff --git a/keylist.cpp b/keylist.cpp
index 585c707..105e371 100644
--- a/keylist.cpp
+++ b/keylist.cpp
@@ -118,6 +118,7 @@ void KeyList::refresh()
* note: privkey status is not returned
*/
GpgKey KeyList::getKeyByFpr(QString fpr) {
+ qDebug() << "begin of getkeybyfpr";
GpgKey key;
for (int i = 0; i < mKeyList->rowCount(); i++) {
if (mKeyList->item(i, 5)->text() == fpr) {
@@ -128,6 +129,7 @@ GpgKey KeyList::getKeyByFpr(QString fpr) {
key.fpr = fpr;
}
}
+ qDebug() << "end of getkeybyfpr";
return key;
}
diff --git a/verifydetailsdialog.cpp b/verifydetailsdialog.cpp
index 477f982..945e928 100644
--- a/verifydetailsdialog.cpp
+++ b/verifydetailsdialog.cpp
@@ -32,15 +32,16 @@ VerifyDetailsDialog::VerifyDetailsDialog(QWidget *parent, GpgME::Context* ctx, K
connect(mCtx, SIGNAL(keyDBChanged()), this, SLOT(refresh()));
mainLayout = new QHBoxLayout();
this->setLayout(mainLayout);
+
+ mVbox = new QWidget();
refresh();
+
this->exec();
}
void VerifyDetailsDialog::refresh()
{
- if (mVbox) {
- mVbox->close();
- }
+ mVbox->close();
mVbox = new QWidget();
mVboxLayout = new QVBoxLayout(mVbox);
@@ -73,7 +74,6 @@ void VerifyDetailsDialog::refresh()
}
}
}
-
// Add informationbox for every single key
while (sign) {
VerifyKeyDetailBox *sbox = new VerifyKeyDetailBox(this,mCtx,mKeyList,sign);