Merge branch 'master' of https://code.google.com/p/qxmpp

2 files changed, 0 insertions, 6 deletions

diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp
index adb7a5a6..dda0a0ed 100644
--- a/src/base/QXmppSocks.cpp
+++ b/src/base/QXmppSocks.cpp
@@ -221,11 +221,6 @@ bool QXmppSocksServer::listen(quint16 port)
     return true;
 }
 
-bool QXmppSocksServer::isListening() const
-{
-    return m_server->isListening();
-}
-
 quint16 QXmppSocksServer::serverPort() const
 {
     return m_server->serverPort();
diff --git a/src/base/QXmppSocks.h b/src/base/QXmppSocks.h
index 23862ae4..cbad1de6 100644
--- a/src/base/QXmppSocks.h
+++ b/src/base/QXmppSocks.h
@@ -61,7 +61,6 @@ class QXMPP_EXPORT QXmppSocksServer : public QObject
 public:
     QXmppSocksServer(QObject *parent=0);
     void close();
-    bool isListening() const;
     bool listen(quint16 port = 0);
 
     quint16 serverPort() const;