From 5161fd3fe53b85f579cfece81e25b562f1fa56ae Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 16 Sep 2012 11:50:15 +0000
Subject: - event code standardization for protocols - fix for
 EVENTTYPE_AUTHREQUEST processing - protocols' custom CallService core removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@1576 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Twitter/proto.cpp |  3 +--
 protocols/Twitter/stubs.cpp | 48 ++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'protocols/Twitter')

diff --git a/protocols/Twitter/proto.cpp b/protocols/Twitter/proto.cpp
index d81fe8163c..40f0e30ec4 100644
--- a/protocols/Twitter/proto.cpp
+++ b/protocols/Twitter/proto.cpp
@@ -147,8 +147,7 @@ HICON TwitterProto::GetIcon(int index)
 
 int TwitterProto::RecvMsg(HANDLE hContact,PROTORECVEVENT *pre)
 {
-	CCSDATA ccs = { hContact,PSR_MESSAGE,0,reinterpret_cast<LPARAM>(pre) };
-	return (int)CallService(MS_PROTO_RECVMSG,0,reinterpret_cast<LPARAM>(&ccs));
+	return Proto_RecvMessage(hContact, pre);
 }
 
 // *************************
diff --git a/protocols/Twitter/stubs.cpp b/protocols/Twitter/stubs.cpp
index 6dabe5ec76..472138abe3 100644
--- a/protocols/Twitter/stubs.cpp
+++ b/protocols/Twitter/stubs.cpp
@@ -19,121 +19,121 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 HANDLE TwitterProto::AddToListByEvent(int flags,int iContact,HANDLE hDbEvent)
 {
-	return 0;
+	return NULL;
 }
 
 int TwitterProto::Authorize(HANDLE hDbEvent)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::AuthDeny(HANDLE hDbEvent,const TCHAR *reason)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::AuthRecv(HANDLE hContact,PROTORECVEVENT *)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::AuthRequest(HANDLE hContact,const TCHAR *message)
 {
-	return 0;
+	return 1;
 }
 
 HANDLE TwitterProto::ChangeInfo(int type,void *info_data)
 {
 	MessageBoxA(0,"ChangeInfo","",0);
-	return 0;
+	return NULL;
 }
 
 HANDLE TwitterProto::FileAllow(HANDLE hContact,HANDLE hTransfer,const TCHAR *path)
 {
-	return 0;
+	return NULL;
 }
 
 int TwitterProto::FileCancel(HANDLE hContact,HANDLE hTransfer)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::FileDeny(HANDLE hContact,HANDLE hTransfer,const TCHAR *reason)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::FileResume(HANDLE hTransfer,int *action,const TCHAR **filename)
 {
-	return 0;
+	return 1;
 }
 
 HANDLE TwitterProto::SearchByName(const TCHAR *nick,const TCHAR *first_name, const TCHAR *last_name)
 {
-	return 0;
+	return NULL;
 }
 
 HWND TwitterProto::SearchAdvanced(HWND owner)
 {
-	return 0;
+	return NULL;
 }
 
 HWND TwitterProto::CreateExtendedSearchUI(HWND owner)
 {
-	return 0;
+	return NULL;
 }
 
 int TwitterProto::RecvContacts(HANDLE hContact,PROTORECVEVENT *)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::RecvFile(HANDLE hContact,PROTORECVFILET *)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::RecvUrl(HANDLE hContact,PROTORECVEVENT *)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::SendContacts(HANDLE hContact,int flags,int nContacts,HANDLE *hContactsList)
 {
-	return 0;
+	return 1;
 }
 
 HANDLE TwitterProto::SendFile(HANDLE hContact,const TCHAR *desc, TCHAR **files)
 {
-	return 0;
+	return NULL;
 }
 
 int TwitterProto::SendUrl(HANDLE hContact,int flags,const char *url)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::SetApparentMode(HANDLE hContact,int mode)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::RecvAwayMsg(HANDLE hContact,int mode,PROTORECVEVENT *evt)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::SendAwayMsg(HANDLE hContact,HANDLE hProcess,const char *msg)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::SetAwayMsg(int status,const TCHAR *msg)
 {
-	return 0;
+	return 1;
 }
 
 int TwitterProto::UserIsTyping(HANDLE hContact,int type)
 {
-	return 0;
+	return 1;
 }
\ No newline at end of file
-- 
cgit v1.2.3