diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-11-30 22:45:49 +0300 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-11-30 22:45:49 +0300 |
| commit | 334fe4d268cd341551b52bbeb3db5e0b5cc0b82a (patch) | |
| tree | 3cad4d849dd0952f56746f4ec88991e22f1b5bc0 /src | |
| parent | 00f3aa2bc7a7c97b859e57938c3dd889347a6610 (diff) | |
Upgrade deps to 4.6.0-rc1, openssl 1.0.0b4, boost 1.41
Diffstat (limited to 'src')
| -rw-r--r-- | src/mumble/Cert.cpp | 6 | ||||
| -rw-r--r-- | src/mumble/UserView.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp index 4cff1f4d9..33c099d14 100644 --- a/src/mumble/Cert.cpp +++ b/src/mumble/Cert.cpp @@ -464,7 +464,7 @@ Settings::KeyPair CertWizard::importCert(QByteArray data, const QString &pw) { qlCerts << qscCert; if (certs) { - for (int i=0;i<sk_num(certs);++i) { + for (int i=0;i<sk_X509_num(certs);++i) { X509 *c = sk_X509_value(certs, i); crt.resize(i2d_X509(c, NULL)); @@ -504,7 +504,7 @@ QByteArray CertWizard::exportCert(const Settings::KeyPair &kp) { EVP_PKEY *pkey = NULL; PKCS12 *pkcs = NULL; BIO *mem = NULL; - STACK_OF(X509) *certs = sk_new_null(); + STACK_OF(X509) *certs = sk_X509_new_null(); const unsigned char *p; long size; char *data = NULL; @@ -576,7 +576,7 @@ QByteArray CertWizard::exportCert(const Settings::KeyPair &kp) { if (mem) BIO_free(mem); if (certs) - sk_free(certs); + sk_X509_free(certs); return qba; } diff --git a/src/mumble/UserView.cpp b/src/mumble/UserView.cpp index 42bdeb4cc..b2483cdb6 100644 --- a/src/mumble/UserView.cpp +++ b/src/mumble/UserView.cpp @@ -109,6 +109,8 @@ bool UserView::event(QEvent *evt) { if (evt->type() == QEvent::WhatsThisClicked) { QWhatsThisClickedEvent *qwtce = static_cast<QWhatsThisClickedEvent *>(evt); QDesktopServices::openUrl(qwtce->href()); + evt->accept(); + return true; } return QTreeView::event(evt); } |