Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Sluift/SluiftException.h3
-rw-r--r--SwifTools/Idle/MacOSXIdleQuerier.cpp2
-rw-r--r--Swift/Controllers/Chat/UserSearchController.cpp2
-rw-r--r--Swift/QtUI/QtMUCConfigurationWindow.cpp2
-rw-r--r--Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h2
-rw-r--r--Swiften/QA/TLSTest/CertificateTest.cpp3
-rw-r--r--Swiften/Session/Session.cpp2
7 files changed, 10 insertions, 6 deletions
diff --git a/Sluift/SluiftException.h b/Sluift/SluiftException.h
index 92326b6..28393ab 100644
--- a/Sluift/SluiftException.h
+++ b/Sluift/SluiftException.h
@@ -25,24 +25,27 @@ namespace Swift {
case ClientError::ConnectionReadError: reason += "Error while receiving server data"; break;
case ClientError::ConnectionWriteError: reason += "Error while sending data to the server"; break;
case ClientError::XMLError: reason += "Error parsing server data"; break;
case ClientError::AuthenticationFailedError: reason += "Login/password invalid"; break;
case ClientError::CompressionFailedError: reason += "Error while compressing stream"; break;
case ClientError::ServerVerificationFailedError: reason += "Server verification failed"; break;
case ClientError::NoSupportedAuthMechanismsError: reason += "Authentication mechanisms not supported"; break;
case ClientError::UnexpectedElementError: reason += "Unexpected response"; break;
case ClientError::ResourceBindError: reason += "Error binding resource"; break;
+ case ClientError::RevokedError: reason += "Certificate got revoked"; break;
+ case ClientError::RevocationCheckFailedError: reason += "Failed to do revokation check"; break;
case ClientError::SessionStartError: reason += "Error starting session"; break;
case ClientError::StreamError: reason += "Stream error"; break;
case ClientError::TLSError: reason += "Encryption error"; break;
case ClientError::ClientCertificateLoadError: reason += "Error loading certificate (Invalid password?)"; break;
case ClientError::ClientCertificateError: reason += "Certificate not authorized"; break;
case ClientError::UnknownCertificateError: reason += "Unknown certificate"; break;
+ case ClientError::CertificateCardRemoved: reason += "Certificate card removed"; break;
case ClientError::CertificateExpiredError: reason += "Certificate has expired"; break;
case ClientError::CertificateNotYetValidError: reason += "Certificate is not yet valid"; break;
case ClientError::CertificateSelfSignedError: reason += "Certificate is self-signed"; break;
case ClientError::CertificateRejectedError: reason += "Certificate has been rejected"; break;
case ClientError::CertificateUntrustedError: reason += "Certificate is not trusted"; break;
case ClientError::InvalidCertificatePurposeError: reason += "Certificate cannot be used for encrypting your connection"; break;
case ClientError::CertificatePathLengthExceededError: reason += "Certificate path length constraint exceeded"; break;
case ClientError::InvalidCertificateSignatureError: reason += "Invalid certificate signature"; break;
case ClientError::InvalidCAError: reason += "Invalid Certificate Authority"; break;
diff --git a/SwifTools/Idle/MacOSXIdleQuerier.cpp b/SwifTools/Idle/MacOSXIdleQuerier.cpp
index b634fcb..233d7c6 100644
--- a/SwifTools/Idle/MacOSXIdleQuerier.cpp
+++ b/SwifTools/Idle/MacOSXIdleQuerier.cpp
@@ -8,19 +8,19 @@
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include <cassert>
#include <iostream>
#include <CoreFoundation/CoreFoundation.h>
namespace Swift {
-MacOSXIdleQuerier::MacOSXIdleQuerier() : ioService(NULL) {
+MacOSXIdleQuerier::MacOSXIdleQuerier() : ioService(0) {
mach_port_t masterPort;
IOMasterPort(MACH_PORT_NULL, &masterPort);
ioService = IOServiceGetMatchingService(masterPort, IOServiceMatching("IOHIDSystem"));
assert(ioService);
}
int MacOSXIdleQuerier::getIdleTimeSeconds() {
CFTypeRef property = IORegistryEntryCreateCFProperty(ioService, CFSTR("HIDIdleTime"), kCFAllocatorDefault, 0);
uint64_t idle = 0;
diff --git a/Swift/Controllers/Chat/UserSearchController.cpp b/Swift/Controllers/Chat/UserSearchController.cpp
index 47d57d4..839f4fa 100644
--- a/Swift/Controllers/Chat/UserSearchController.cpp
+++ b/Swift/Controllers/Chat/UserSearchController.cpp
@@ -42,19 +42,19 @@ UserSearchController::~UserSearchController() {
}
vcardManager_->onVCardChanged.disconnect(boost::bind(&UserSearchController::handleVCardChanged, this, _1, _2));
uiEventStream_->onUIEvent.disconnect(boost::bind(&UserSearchController::handleUIEvent, this, _1));
}
void UserSearchController::handleUIEvent(boost::shared_ptr<UIEvent> event) {
bool handle = false;
boost::shared_ptr<RequestAddUserDialogUIEvent> request = boost::shared_ptr<RequestAddUserDialogUIEvent>();
if (type_ == AddContact) {
- if (request = boost::dynamic_pointer_cast<RequestAddUserDialogUIEvent>(event)) {
+ if ((request = boost::dynamic_pointer_cast<RequestAddUserDialogUIEvent>(event))) {
handle = true;
}
} else {
if (boost::dynamic_pointer_cast<RequestChatWithUserDialogUIEvent>(event)) {
handle = true;
}
}
if (handle) {
if (!window_) {
diff --git a/Swift/QtUI/QtMUCConfigurationWindow.cpp b/Swift/QtUI/QtMUCConfigurationWindow.cpp
index 6fdfd43..83a5f35 100644
--- a/Swift/QtUI/QtMUCConfigurationWindow.cpp
+++ b/Swift/QtUI/QtMUCConfigurationWindow.cpp
@@ -38,19 +38,19 @@ QtMUCConfigurationWindow::QtMUCConfigurationWindow(Form::ref form) : closed_(fal
buttonsLayout->addWidget(okButton_);
connect(okButton_, SIGNAL(clicked()), this, SLOT(handleOKClicked()));
show();
}
QtMUCConfigurationWindow::~QtMUCConfigurationWindow() {
}
-void QtMUCConfigurationWindow::closeEvent(QCloseEvent* event) {
+void QtMUCConfigurationWindow::closeEvent(QCloseEvent* /*event*/) {
if (!closed_) {
onFormCancelled();
}
}
void QtMUCConfigurationWindow::handleCancelClicked() {
close();
}
diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h
index fd0e9d0..d3c9488 100644
--- a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h
@@ -35,19 +35,19 @@ namespace Swift {
}
}
void unregisterService() {
finish();
}
void updateServiceInfo(const ByteArray& txtRecord) {
boost::lock_guard<boost::mutex> lock(sdRefMutex);
- DNSServiceUpdateRecord(sdRef, NULL, NULL, txtRecord.size(), vecptr(txtRecord), 0);
+ DNSServiceUpdateRecord(sdRef, NULL, 0, txtRecord.size(), vecptr(txtRecord), 0);
}
private:
static void handleServiceRegisteredStatic(DNSServiceRef, DNSServiceFlags, DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain, void *context) {
static_cast<BonjourRegisterQuery*>(context)->handleServiceRegistered(errorCode, name, regtype, domain);
}
void handleServiceRegistered(DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain) {
if (errorCode != kDNSServiceErr_NoError) {
diff --git a/Swiften/QA/TLSTest/CertificateTest.cpp b/Swiften/QA/TLSTest/CertificateTest.cpp
index 67ca064..6932881 100644
--- a/Swiften/QA/TLSTest/CertificateTest.cpp
+++ b/Swiften/QA/TLSTest/CertificateTest.cpp
@@ -1,22 +1,23 @@
/*
* Copyright (c) 2010 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#include <Swiften/Base/ByteArray.h>
+#include <QA/Checker/IO.h>
+
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <boost/bind.hpp>
-#include <QA/Checker/IO.h>
#include <Swiften/TLS/CertificateFactory.h>
#include "SwifTools/Application/PlatformApplicationPathProvider.h"
using namespace Swift;
template<typename CERTIFICATE_FACTORY>
class CertificateTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(CertificateTest);
CPPUNIT_TEST(testConstructFromDER);
diff --git a/Swiften/Session/Session.cpp b/Swiften/Session/Session.cpp
index 0eef997..acc73f1 100644
--- a/Swiften/Session/Session.cpp
+++ b/Swiften/Session/Session.cpp
@@ -44,19 +44,19 @@ void Session::finishSession() {
return;
}
finishing = true;
if (xmppLayer) {
xmppLayer->writeFooter();
}
connection->disconnect();
}
-void Session::finishSession(const SessionError& error) {
+void Session::finishSession(const SessionError& /*error*/) {
if (finishing) {
return;
}
finishing = true;
if (xmppLayer) {
xmppLayer->writeFooter();
}
connection->disconnect();
}