Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop int…

…o dev
digitalsoft · Mar 25, 2016 · 9c7ac50 · 9c7ac50
2 parents 599ede9 + 3e79d74
commit 9c7ac50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Telegram/SourceFiles/mtproto/connection_auto.cpp b/Telegram/SourceFiles/mtproto/connection_auto.cpp
@@ -255,7 +255,7 @@ void AutoConnection::requestFinished(QNetworkReply *reply) {
 void AutoConnection::socketPacket(const char *packet, uint32 length) {
 	if (status == FinishedWork) return;
 
-	mtpBuffer data = TCPConnection::handleResponse(packet, length);
+	mtpBuffer data = AbstractTCPConnection::handleResponse(packet, length);
 	if (data.size() == 1) {
 		if (status == WaitingBoth) {
 			status = WaitingHttp;
@@ -326,7 +326,7 @@ QString AutoConnection::transport() const {
 void AutoConnection::socketError(QAbstractSocket::SocketError e) {
 	if (status == FinishedWork) return;
 
-	TCPConnection::handleError(e, sock);
+	AbstractTCPConnection::handleError(e, sock);
 	if (status == WaitingBoth) {
 		status = WaitingHttp;
 	} else if (status == HttpReady) {

diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro
@@ -117,6 +117,10 @@ SOURCES += \
     ./SourceFiles/mtproto/facade.cpp \
     ./SourceFiles/mtproto/auth_key.cpp \
     ./SourceFiles/mtproto/connection.cpp \
+    ./SourceFiles/mtproto/connection_abstract.cpp \
+    ./SourceFiles/mtproto/connection_auto.cpp \
+    ./SourceFiles/mtproto/connection_http.cpp \
+    ./SourceFiles/mtproto/connection_tcp.cpp \
     ./SourceFiles/mtproto/core_types.cpp \
     ./SourceFiles/mtproto/dcenter.cpp \
     ./SourceFiles/mtproto/file_download.cpp \
@@ -209,6 +213,10 @@ HEADERS += \
     ./SourceFiles/mtproto/facade.h \
     ./SourceFiles/mtproto/auth_key.h \
     ./SourceFiles/mtproto/connection.h \
+    ./SourceFiles/mtproto/connection_abstract.h \
+    ./SourceFiles/mtproto/connection_auto.h \
+    ./SourceFiles/mtproto/connection_http.h \
+    ./SourceFiles/mtproto/connection_tcp.h \
     ./SourceFiles/mtproto/core_types.h \
     ./SourceFiles/mtproto/dcenter.h \
     ./SourceFiles/mtproto/file_download.h \