separate handle types for HNETLIBCONN & HNETLIBBIND

4 files changed, 7 insertions, 7 deletions

diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp
index ede32afc42..da7be52e72 100644
--- a/protocols/FacebookRM/src/avatars.cpp
+++ b/protocols/FacebookRM/src/avatars.cpp
@@ -86,7 +86,7 @@ void FacebookProto::CheckAvatarChange(MCONTACT hContact, const std::string &imag
 

 void FacebookProto::UpdateAvatarWorker(void *)

 {

-	HANDLE nlc = NULL;

+	HNETLIBCONN nlc = NULL;

 

 	debugLogA("*** UpdateAvatarWorker");

 

diff --git a/protocols/FacebookRM/src/client.h b/protocols/FacebookRM/src/client.h
index f36635c979..d563b8a6bd 100644
--- a/protocols/FacebookRM/src/client.h
+++ b/protocols/FacebookRM/src/client.h
@@ -50,9 +50,9 @@ public:
 		loading_history = false;

 	}

 

-	HANDLE hChannelCon;

-	HANDLE hMessagesCon;

-	HANDLE hFcbCon;

+	HNETLIBCONN hChannelCon;

+	HNETLIBCONN hMessagesCon;

+	HNETLIBCONN hFcbCon;

 	HANDLE fcb_conn_lock_;

 

 	// Random generator value for this client

@@ -214,7 +214,7 @@ public:
 	// HTTP communication

 

 	http::response sendRequest(HttpRequest *request);

-	bool save_url(const std::string &url,const std::wstring &filename, HANDLE &nlc);

+	bool save_url(const std::string &url, const std::wstring &filename, HNETLIBCONN &nlc);

 

 	////////////////////////////////////////////////////////////

 	// Netlib handle

diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index c36c064994..3ce901be9a 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -1183,7 +1183,7 @@ bool facebook_client::post_status(status_data *status)
 
 //////////////////////////////////////////////////////////////////////////////
 
-bool facebook_client::save_url(const std::string &url, const std::wstring &filename, HANDLE &nlc)
+bool facebook_client::save_url(const std::string &url, const std::wstring &filename, HNETLIBCONN &nlc)
 {
 	NETLIBHTTPREQUEST req = { sizeof(req) };
 	NETLIBHTTPREQUEST *resp;
diff --git a/protocols/FacebookRM/src/messages.cpp b/protocols/FacebookRM/src/messages.cpp
index d0a5936a79..1c5e786f9a 100644
--- a/protocols/FacebookRM/src/messages.cpp
+++ b/protocols/FacebookRM/src/messages.cpp
@@ -208,7 +208,7 @@ void FacebookProto::StickerAsSmiley(std::string sticker, const std::string &url,
 
 	// Check if we have this sticker already and download it if not
 	if (GetFileAttributes(filename.c_str()) == INVALID_FILE_ATTRIBUTES) {
-		HANDLE nlc = NULL;
+		HNETLIBCONN nlc = NULL;
 		facy.save_url(url, filename, nlc);
 		Netlib_CloseHandle(nlc);
 	}