X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.cpp;h=d889a9c60747b9c7f9b632b1096e41b3d084b852;hb=68878dc8366f2f4a0afe132847aad9a51a80cdbf;hp=b0c4feb4f9d29a3322e9124ebc1e90ec17509cf5;hpb=61aac1868f15babb7086d8bc6bbcff530346f438;p=quassel.git diff --git a/src/client/coreconnection.cpp b/src/client/coreconnection.cpp index b0c4feb4..d889a9c6 100644 --- a/src/client/coreconnection.cpp +++ b/src/client/coreconnection.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -184,6 +184,15 @@ void CoreConnection::onlineStateChanged(bool isOnline) } +QPointer CoreConnection::peer() const +{ + if (_peer) { + return _peer; + } + return _authHandler ? _authHandler->peer() : nullptr; +} + + bool CoreConnection::isEncrypted() const { return _peer && _peer->isSecure(); @@ -463,9 +472,6 @@ void CoreConnection::onHandshakeComplete(RemotePeer *peer, const Protocol::Sessi void CoreConnection::internalSessionStateReceived(const Protocol::SessionState &sessionState) { updateProgress(100, 100); - - Client::setCoreFeatures(Quassel::features()); // mono connection... - setState(Synchronizing); syncToCore(sessionState); }