4 files changed, 11 insertions, 3 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index a7e2bed..2c2d629 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -241,73 +241,76 @@ elif not env.get("boost_bundled_enable", True) :
     print "Error: Boost not found and boost_bundled_enable is false"
     Exit(1)
 else :
     env["BOOST_BUNDLED"] = True
 conf.Finish()
 
 
 # Xss
 env["HAVE_XSS"] = 0
 if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
     xss_flags = {
             "LIBPATH": ["/usr/X11R6/lib"],
             "LIBS": ["Xss"]
         }
     xss_env = conf_env.Clone()
     xss_env.MergeFlags(xss_flags)
     conf = Configure(xss_env)
     if conf.CheckFunc("XScreenSaverQueryExtension") :
         env["HAVE_XSS"] = 1
         env["XSS_FLAGS"] = xss_flags
     conf.Finish()
 
 # GConf
 env["HAVE_GCONF"] = 0
 if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
     gconf_env = conf_env.Clone()
     conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
     if conf.CheckPKG("gconf-2.0") :
         gconf_bare_env = Environment()
         gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
+        if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) :
+            gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]]
+            gconf_bare_env["CPPPATH"] = []
         gconf_flags = {
                 "LIBS": gconf_bare_env["LIBS"],
                 "CCFLAGS": gconf_bare_env["CCFLAGS"],
                 "CPPPATH": gconf_bare_env["CPPPATH"],
                 "CPPDEFINES": gconf_bare_env.get("CPPDEFINES", []),
             }
         gconf_env.MergeFlags(gconf_flags)
         if conf.CheckCHeader("gconf/gconf-client.h") and conf.CheckLib("gconf-2") :
             env["HAVE_GCONF"] = 1
             env["GCONF_FLAGS"] = {
                 "LIBS": gconf_env["LIBS"],
                 "CCFLAGS": gconf_env["CCFLAGS"],
-                "CPPPATH": gconf_env["CPPPATH"],
+                "CPPPATH": gconf_env.get("CPPPATH", []),
                 "CPPDEFINES": gconf_env.get("CPPDEFINES", []),
             }
     conf.Finish()
 
 # Sparkle
 env["HAVE_SPARKLE"] = 0
 if env["PLATFORM"] == "darwin" :
     sparkle_flags = {
             "FRAMEWORKPATH": ["3rdParty/Sparkle/Sparkle-1.14.0"],
             "FRAMEWORKS": ["Sparkle"]
         }
     sparkle_env = conf_env.Clone()
     sparkle_env.MergeFlags(sparkle_flags)
     conf = Configure(sparkle_env, custom_tests = { "CheckObjCHeader" : checkObjCHeader })
     if conf.CheckObjCHeader("Sparkle/Sparkle.h") :
         env["HAVE_SPARKLE"] = 1
         env["SPARKLE_FLAGS"] = sparkle_flags
         env["SPARKLE_FRAMEWORK"] = Dir("../../3rdParty/Sparkle/Sparkle-1.14.0/Sparkle.framework")
         env["SPARKLE_COPYING"] = File("../../3rdParty/Sparkle/Sparkle-1.14.0/LICENSE")
     conf.Finish()
 
     if env.get("sparkle_public_dsa_key", None) != None :
         env["SWIFT_SPARKLE_PUBLIC_DSA_KEY"] = File(env.get("sparkle_public_dsa_key"))
     else :
         env["SWIFT_SPARKLE_PUBLIC_DSA_KEY"] = None
 
 # Growl
 env["HAVE_GROWL"] = 0
 if env["PLATFORM"] == "darwin" :
     growl_flags = {
diff --git a/Swift/QtUI/QtCertificateViewerDialog.cpp b/Swift/QtUI/QtCertificateViewerDialog.cpp
index 6454d82..a36ccdb 100644
--- a/Swift/QtUI/QtCertificateViewerDialog.cpp
+++ b/Swift/QtUI/QtCertificateViewerDialog.cpp
@@ -89,60 +89,58 @@ void QtCertificateViewerDialog::currentItemChanged(QTreeWidgetItem* current, QTr
 
 void QtCertificateViewerDialog::setCertificateDetails(const QSslCertificate& cert) {
     QLayoutItem* item;
     while ((item = ui->certGridLayout->takeAt(0)) != NULL ) {
         delete item->widget();
         delete item;
     }
 
     int rowCount = 0;
 
     ui->certGridLayout->setColumnStretch(2, 1);
 
     QLabel* valueLabel = 0;
 
     ADD_SECTION(tr("General"));
     ADD_FIELD(tr("Valid From"), cert.effectiveDate().toString(Qt::TextDate));
     ADD_FIELD(tr("Valid To"), cert.expiryDate().toString(Qt::TextDate));
     ADD_FIELD(tr("Serial Number"), QString(cert.serialNumber().toHex()));
     ADD_FIELD(tr("Version"), QString(cert.version()));
 
     ADD_SECTION(tr("Subject"));
     ADD_FIELD(tr("Organization"), cert.subjectInfo(QSslCertificate::Organization));
     ADD_FIELD(tr("Common Name"), cert.subjectInfo(QSslCertificate::CommonName));
     ADD_FIELD(tr("Locality"), cert.subjectInfo(QSslCertificate::LocalityName));
     ADD_FIELD(tr("Organizational Unit"), cert.subjectInfo(QSslCertificate::OrganizationalUnitName));
     ADD_FIELD(tr("Country"), cert.subjectInfo(QSslCertificate::CountryName));
     ADD_FIELD(tr("State"), cert.subjectInfo(QSslCertificate::StateOrProvinceName));
 
 #if QT_VERSION < 0x050000
     QMultiMap<QSsl::AlternateNameEntryType, QString> altNames = cert.alternateSubjectNames();
-#define SANTYPE QSsl::AlternateNameEntryType
 #else
     QMultiMap<QSsl::AlternativeNameEntryType, QString> altNames = cert.subjectAlternativeNames();
-#define SANTYPE QSsl::AlternativeNameEntryType
 #endif
     if (!altNames.empty()) {
         ADD_SECTION(tr("Alternate Subject Names"));
         for (const auto& type : altNames.uniqueKeys()) {
             for (auto&& name : altNames.values(type)) {
                 if (type == QSsl::EmailEntry) {
                     ADD_FIELD(tr("E-mail Address"), name);
                 } else {
                     ADD_FIELD(tr("DNS Name"), name);
                 }
             }
         }
     }
 
     ADD_SECTION(tr("Issuer"));
     ADD_FIELD(tr("Organization"), cert.issuerInfo(QSslCertificate::Organization));
     ADD_FIELD(tr("Common Name"), cert.issuerInfo(QSslCertificate::CommonName));
     ADD_FIELD(tr("Locality"), cert.issuerInfo(QSslCertificate::LocalityName));
     ADD_FIELD(tr("Organizational Unit"), cert.issuerInfo(QSslCertificate::OrganizationalUnitName));
     ADD_FIELD(tr("Country"), cert.issuerInfo(QSslCertificate::CountryName));
     ADD_FIELD(tr("State"), cert.issuerInfo(QSslCertificate::StateOrProvinceName));
 
     ui->certGridLayout->setRowStretch(rowCount + 1, 1);
 }
 
 }
diff --git a/Swift/QtUI/QtDBUSURIHandler.cpp b/Swift/QtUI/QtDBUSURIHandler.cpp
index c873676..34659f4 100644
--- a/Swift/QtUI/QtDBUSURIHandler.cpp
+++ b/Swift/QtUI/QtDBUSURIHandler.cpp
@@ -1,41 +1,46 @@
 /*
  * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtDBUSURIHandler.h>
 
 #include <QDBusAbstractAdaptor>
 #include <QDBusConnection>
 
 #include <Swift/QtUI/QtSwiftUtil.h>
 
 using namespace Swift;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-member-function"
+
 namespace {
     class DBUSAdaptor: public QDBusAbstractAdaptor {
             Q_OBJECT
             Q_CLASSINFO("D-Bus Interface", "im.swift.Swift.URIHandler");
         public:
             DBUSAdaptor(QtDBUSURIHandler* uriHandler) : QDBusAbstractAdaptor(uriHandler), uriHandler(uriHandler) {
             }
 
         public slots:
             void openURI(const QString& uri) {
                 uriHandler->onURI(Q2PSTRING(uri));
             }
 
         private:
             QtDBUSURIHandler* uriHandler;
     };
 }
 
 QtDBUSURIHandler::QtDBUSURIHandler() {
     new DBUSAdaptor(this);
     QDBusConnection connection = QDBusConnection::sessionBus();
     connection.registerService("im.swift.Swift.URIHandler");
     connection.registerObject("/", this);
 }
 
+#pragma clang diagnostic pop
+
 #include "QtDBUSURIHandler.moc"
diff --git a/Swiften/Network/UnixProxyProvider.cpp b/Swiften/Network/UnixProxyProvider.cpp
index e6afa3d..854d501 100644
--- a/Swiften/Network/UnixProxyProvider.cpp
+++ b/Swiften/Network/UnixProxyProvider.cpp
@@ -3,60 +3,62 @@
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/UnixProxyProvider.h>
 
 #if defined(HAVE_GCONF)
 #  include "Swiften/Network/GConfProxyProvider.h"
 #endif
 
 namespace Swift {
 
 UnixProxyProvider::UnixProxyProvider() :
     gconfProxyProvider(nullptr),
     environmentProxyProvider()
 {
 #if defined(HAVE_GCONF)
     gconfProxyProvider = new GConfProxyProvider();
 #endif
 }
 
 UnixProxyProvider::~UnixProxyProvider() {
 #if defined(HAVE_GCONF)
     delete gconfProxyProvider;
+#else
+    (void)gconfProxyProvider;
 #endif
 }
 
 HostAddressPort UnixProxyProvider::getSOCKS5Proxy() const {
     HostAddressPort proxy;
 #if defined(HAVE_GCONF)
     proxy = gconfProxyProvider->getSOCKS5Proxy();
     if(proxy.isValid()) {
         return proxy;
     }
 #endif
     proxy = environmentProxyProvider.getSOCKS5Proxy();
     if(proxy.isValid()) {
         return proxy;
     }
     return HostAddressPort(HostAddress(), 0);
 }
 
 HostAddressPort UnixProxyProvider::getHTTPConnectProxy() const {
     HostAddressPort proxy;
 #if defined(HAVE_GCONF)
     proxy = gconfProxyProvider->getHTTPConnectProxy();
     if(proxy.isValid()) {
         return proxy;
     }
 #endif
     proxy = environmentProxyProvider.getHTTPConnectProxy();
     if(proxy.isValid()) {
         return proxy;
     }