mirror of
https://github.com/KDE/krfb
synced 2026-07-01 07:31:16 -07:00
Adapt to new KWarning/kFatal/kDebug api
svn path=/trunk/KDE/kdenetwork/krfb/; revision=695881
This commit is contained in:
@@ -144,7 +144,7 @@ bool ConnectionController::handleCheckPassword(rfbClientPtr cl, const char *resp
|
||||
QString password = KrfbConfig::uninvitedConnectionPassword();
|
||||
|
||||
bool authd = false;
|
||||
kDebug() << "about to start autentication" << endl;
|
||||
kDebug() << "about to start autentication";
|
||||
|
||||
if (allowUninvited) {
|
||||
authd = checkPassword(password, cl->authChallenge, response, len);
|
||||
@@ -154,7 +154,7 @@ bool ConnectionController::handleCheckPassword(rfbClientPtr cl, const char *resp
|
||||
QList<Invitation> invlist = InvitationManager::self()->invitations();
|
||||
|
||||
foreach(Invitation it, invlist) {
|
||||
kDebug() << "checking password" << endl;
|
||||
kDebug() << "checking password";
|
||||
if (checkPassword(it.password(), cl->authChallenge, response, len) && it.isValid()) {
|
||||
authd = true;
|
||||
InvitationManager::self()->removeInvitation(it);
|
||||
@@ -200,7 +200,7 @@ void ConnectionController::handlePointerEvent(int bm, int x, int y)
|
||||
void ConnectionController::handleClientGone()
|
||||
{
|
||||
emit clientDisconnected(this);
|
||||
kDebug() << "client gone" << endl;
|
||||
kDebug() << "client gone";
|
||||
deleteLater();
|
||||
}
|
||||
|
||||
@@ -218,7 +218,7 @@ void ConnectionController::dialogAccepted()
|
||||
|
||||
void ConnectionController::dialogRejected()
|
||||
{
|
||||
kDebug() << "refused connection" << endl;
|
||||
kDebug() << "refused connection";
|
||||
rfbRefuseOnHoldClient(cl);
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ Invitation::Invitation(const Invitation &x)
|
||||
|
||||
Invitation::Invitation(const KConfigGroup &config) {
|
||||
m_password = KStringHandler::obscure(config.readEntry("password", QString()));
|
||||
kDebug() << "read: " << config.readEntry("password", QString()) << " = " << m_password << endl;
|
||||
kDebug() << "read: " << config.readEntry("password", QString()) << " = " << m_password;
|
||||
m_creationTime = config.readEntry("creation", QDateTime());
|
||||
m_expirationTime = config.readEntry("expiration", QDateTime());
|
||||
}
|
||||
@@ -73,7 +73,7 @@ Invitation &Invitation::operator= (const Invitation&x) {
|
||||
}
|
||||
|
||||
void Invitation::save(KConfigGroup &config) const {
|
||||
kDebug() << "write: " << m_password << ": " << KStringHandler::obscure(m_password) << endl;
|
||||
kDebug() << "write: " << m_password << ": " << KStringHandler::obscure(m_password);
|
||||
config.writeEntry("password", KStringHandler::obscure(m_password));
|
||||
config.writeEntry("creation", m_creationTime);
|
||||
config.writeEntry("expiration", m_expirationTime);
|
||||
|
||||
@@ -350,7 +350,7 @@ void PortListener::setServiceRegistrationEnabledInternal(bool e) {
|
||||
*(it++),
|
||||
*(it2++),
|
||||
m_serviceLifetime))
|
||||
kDebug(7021) << "Failure registering SLP service (no slpd running?)"<< endl;
|
||||
kDebug(7021) << "Failure registering SLP service (no slpd running?)";
|
||||
}
|
||||
m_serviceRegistered = true;
|
||||
// make lifetime 30s shorter, because the timeout is not precise
|
||||
@@ -414,7 +414,7 @@ KInetD::KInetD() :
|
||||
m_config = new KConfig("kinetdrc");
|
||||
m_srvreg = new KServiceRegistry();
|
||||
if (!m_srvreg->available()) {
|
||||
kDebug(7021) << "SLP not available"<< endl;
|
||||
kDebug(7021) << "SLP not available";
|
||||
delete m_srvreg;
|
||||
m_srvreg = 0;
|
||||
}
|
||||
|
||||
@@ -34,4 +34,4 @@
|
||||
<label>Password for uninvited connections.</label>
|
||||
</entry>
|
||||
</group>
|
||||
</kcfg>
|
||||
</kcfg>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
File=krfb.kcfg
|
||||
ClassName=KrfbConfig
|
||||
Singleton=true
|
||||
Singleton=true
|
||||
|
||||
@@ -139,7 +139,7 @@ KrfbServer * KrfbServer::self() {
|
||||
KrfbServer::KrfbServer()
|
||||
:d(new KrfbServerP)
|
||||
{
|
||||
kDebug() << "starting " << endl;
|
||||
kDebug() << "starting ";
|
||||
d->running = true;
|
||||
d->fb = FrameBuffer::getFrameBuffer(QApplication::desktop()->winId(), this);
|
||||
QTimer::singleShot(0, this, SLOT(startListening()));
|
||||
@@ -264,10 +264,10 @@ void KrfbServer::updatePassword()
|
||||
" invitations " << InvitationManager::self()->activeInvitations() << endl;
|
||||
|
||||
if (pw.isEmpty() && InvitationManager::self()->activeInvitations() == 0) {
|
||||
kDebug() << "no password from now on" << endl;
|
||||
kDebug() << "no password from now on";
|
||||
d->screen->authPasswdData = (void *)0;
|
||||
} else {
|
||||
kDebug() << "Ask for password to accept connections" << endl;
|
||||
kDebug() << "Ask for password to accept connections";
|
||||
d->screen->authPasswdData = (void *)1;
|
||||
}
|
||||
}
|
||||
@@ -288,7 +288,7 @@ bool KrfbServer::checkX11Capabilities() {
|
||||
|
||||
void KrfbServer::clientDisconnected(ConnectionController *cc)
|
||||
{
|
||||
kDebug() << "clients--: " << d->numClients << endl;
|
||||
kDebug() << "clients--: " << d->numClients;
|
||||
d->numClients--;
|
||||
if (d->numClients == 0) {
|
||||
d->fb->stopMonitor();
|
||||
|
||||
Reference in New Issue
Block a user