← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to src/murmur/Register.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Thorvald Natvig, Patrick Matthäi, Thorvald Natvig
  • Date: 2011-02-19 22:58:58 UTC
  • mfrom: (9.1.15 sid)
  • Revision ID: james.westby@ubuntu.com-20110219225858-0xlftrf4z1z4jt9e
Tags: 1.2.3-1
[ Patrick Matthäi ]
* Do not build with non existant libpulse-dev on hurd-i386.

[ Thorvald Natvig ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/murmur/Register.cpp
105
105
        t=doc.createTextNode(QString::number(qhChannels.count()));
106
106
        tag.appendChild(t);
107
107
 
 
108
        if (!qsRegLocation.isEmpty()) {
 
109
                tag=doc.createElement(QLatin1String("location"));
 
110
                root.appendChild(tag);
 
111
                t=doc.createTextNode(qsRegLocation);
 
112
                tag.appendChild(t);
 
113
        }
 
114
 
108
115
        QNetworkRequest qnr(QUrl(QLatin1String("https://mumble.hive.no/register.cgi")));
109
116
        qnr.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("text/xml"));
110
117
 
115
122
        /* Work around bug in QSslConfiguration */
116
123
        QList<QSslCertificate> calist = ssl.caCertificates();
117
124
        calist << QSslSocket::defaultCaCertificates();
 
125
        calist << qscCert;
118
126
        ssl.setCaCertificates(calist);
119
127
 
120
128
        qnr.setSslConfiguration(ssl);