From 3b55ee911e8e2186c2d72e03874307d3aec91b8c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 12 Jan 2017 19:44:03 +0300
Subject: - stronger types, part II;

- don't call hNetlibUser hConnection
---
 protocols/SkypeWeb/src/http_request.h    | 6 +++---
 protocols/SkypeWeb/src/request_queue.cpp | 6 +++---
 protocols/SkypeWeb/src/request_queue.h   | 5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'protocols/SkypeWeb/src')

diff --git a/protocols/SkypeWeb/src/http_request.h b/protocols/SkypeWeb/src/http_request.h
index a696a2f9c6..b7c8ef73be 100644
--- a/protocols/SkypeWeb/src/http_request.h
+++ b/protocols/SkypeWeb/src/http_request.h
@@ -263,7 +263,7 @@ public:
 		mir_free(headers);
 	}
 
-	virtual NETLIBHTTPREQUEST* Send(HANDLE hConnection)
+	virtual NETLIBHTTPREQUEST* Send(HNETLIBUSER nlu)
 	{
 		if (url.Find("://") == -1)
 			url.Insert(0, ((flags & NLHRF_SSL) ? "https://" : "http://"));
@@ -274,9 +274,9 @@ public:
 			dataLength = (int)mir_strlen(pData);
 		}
 
-		Netlib_Logf(Netlib_GetConnNlu(hConnection), "Send request to %s", szUrl);
+		Netlib_Logf(nlu, "Send request to %s", szUrl);
 
-		return (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hConnection, (LPARAM)(NETLIBHTTPREQUEST*)this);
+		return (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)nlu, (LPARAM)(NETLIBHTTPREQUEST*)this);
 	}
 };
 
diff --git a/protocols/SkypeWeb/src/request_queue.cpp b/protocols/SkypeWeb/src/request_queue.cpp
index fecc5f0adf..57c7cf40a4 100644
--- a/protocols/SkypeWeb/src/request_queue.cpp
+++ b/protocols/SkypeWeb/src/request_queue.cpp
@@ -17,8 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdafx.h"
 
-RequestQueue::RequestQueue(HANDLE hConnection) :
-hConnection(hConnection), requests(1)
+RequestQueue::RequestQueue(HNETLIBUSER _nlu) :
+	nlu(_nlu), requests(1)
 {
 	isTerminated = true;
 	hRequestQueueThread = NULL;
@@ -70,7 +70,7 @@ void RequestQueue::Send(HttpRequest *request, HttpResponseCallback response, voi
 
 void RequestQueue::Execute(RequestQueueItem *item)
 {
-	NETLIBHTTPREQUEST *response = item->request->Send(hConnection);
+	NETLIBHTTPREQUEST *response = item->request->Send(nlu);
 	if (item->responseCallback != NULL)
 		item->responseCallback(response, item->arg);
 	CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)response);
diff --git a/protocols/SkypeWeb/src/request_queue.h b/protocols/SkypeWeb/src/request_queue.h
index 5ea8e7d1e8..90ebb0cfa6 100644
--- a/protocols/SkypeWeb/src/request_queue.h
+++ b/protocols/SkypeWeb/src/request_queue.h
@@ -42,9 +42,8 @@ struct RequestQueueItem
 
 class RequestQueue
 {
-private:
 	bool isTerminated;
-	HANDLE hConnection;
+	HNETLIBUSER nlu;
 	mir_cs requestQueueLock;
 	LIST<RequestQueueItem> requests;
 	EventHandle hRequestQueueEvent;
@@ -56,7 +55,7 @@ private:
 	static unsigned int __cdecl WorkerThread(void*);
 
 public:
-	RequestQueue(HANDLE hConnection);
+	RequestQueue(HNETLIBUSER nlu);
 	~RequestQueue();
 
 	void Start();
-- 
cgit v1.2.3