projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Encapsulate socket state in AuthHandler, properly handle disconnects
[quassel.git]
/
src
/
common
/
remotepeer.cpp
diff --git
a/src/common/remotepeer.cpp
b/src/common/remotepeer.cpp
index
fba57cd
..
8ed3469
100644
(file)
--- a/
src/common/remotepeer.cpp
+++ b/
src/common/remotepeer.cpp
@@
-41,7
+41,6
@@
RemotePeer::RemotePeer(::AuthHandler *authHandler, QTcpSocket *socket, QObject *
{
socket->setParent(this);
connect(socket, SIGNAL(disconnected()), SIGNAL(disconnected()));
{
socket->setParent(this);
connect(socket, SIGNAL(disconnected()), SIGNAL(disconnected()));
- connect(socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SIGNAL(socketStateChanged(QAbstractSocket::SocketState)));
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError)));
#ifdef HAVE_SSL
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError)));
#ifdef HAVE_SSL
@@
-54,6
+53,14
@@
RemotePeer::RemotePeer(::AuthHandler *authHandler, QTcpSocket *socket, QObject *
}
}
+void RemotePeer::onSocketStateChanged(QAbstractSocket::SocketState state)
+{
+ if (state == QAbstractSocket::ClosingState) {
+ emit statusMessage(tr("Disconnecting..."));
+ }
+}
+
+
void RemotePeer::onSocketError(QAbstractSocket::SocketError error)
{
emit socketError(error, socket()->errorString());
void RemotePeer::onSocketError(QAbstractSocket::SocketError error)
{
emit socketError(error, socket()->errorString());