separate handle types for HNETLIBCONN & HNETLIBBIND

3 files changed, 1 insertions, 10 deletions

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 8446207d64..8160e13e14 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -191,7 +191,6 @@ int TwitterProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
 {

 	switch (event) {

 	case EV_PROTO_ONLOAD:    return OnModulesLoaded(wParam, lParam);

-	case EV_PROTO_ONEXIT:    return OnPreShutdown(wParam, lParam);

 	case EV_PROTO_ONOPTIONS: return OnOptionsInit(wParam, lParam);

 	}

 

@@ -347,13 +346,6 @@ int TwitterProto::OnModulesLoaded(WPARAM, LPARAM)
 	return 0;

 }

 

-int TwitterProto::OnPreShutdown(WPARAM, LPARAM)

-{

-	Netlib_Shutdown(m_hNetlibUser);

-	Netlib_Shutdown(hAvatarNetlib_);

-	return 0;

-}

-

 int TwitterProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)

 {

 	MCONTACT hContact = (MCONTACT) wParam;

diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h
index d344bc1a9e..c1be3f728c 100644
--- a/protocols/Twitter/src/proto.h
+++ b/protocols/Twitter/src/proto.h
@@ -65,7 +65,6 @@ public:
 	int  __cdecl OnBuildStatusMenu(WPARAM,LPARAM);

 	int  __cdecl OnOptionsInit(WPARAM,LPARAM);

 	int  __cdecl OnModulesLoaded(WPARAM,LPARAM);

-	int  __cdecl OnPreShutdown(WPARAM,LPARAM);

 	int  __cdecl OnPrebuildContactMenu(WPARAM,LPARAM);

 	int  __cdecl OnChatOutgoing(WPARAM,LPARAM);

 

diff --git a/protocols/Twitter/src/utility.h b/protocols/Twitter/src/utility.h
index e7e14e084c..b8052df5be 100644
--- a/protocols/Twitter/src/utility.h
+++ b/protocols/Twitter/src/utility.h
@@ -85,7 +85,7 @@ public:
 protected:

 	http::response slurp(const std::string &,http::method, OAuthParameters );

 

-	HANDLE httpPOST_;

+	HNETLIBCONN httpPOST_;

 	HNETLIBUSER handle_;

 	PROTO_INTERFACE *ppro_;

 };