From 686b657701e50c3682045fdf4af9283e14087e04 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 2 Nov 2014 22:29:54 +0000 Subject: end of ancient perversion with connection data & false connections git-svn-id: http://svn.miranda-ng.org/main/trunk@10910 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_proto.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'protocols/JabberG/src/jabber_proto.h') diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 522f3546da..5303bc5c5a 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -160,7 +160,6 @@ struct CJabberProto : public PROTO, public IJabberInterface HANDLE m_hThreadHandle; TCHAR *m_szJabberJID; - char *m_szStreamId; BOOL m_bJabberOnline; // XMPP connection initialized and we can send XMPP packets int m_nJabberSearchID; time_t m_tmJabberLoggedInTime; @@ -333,8 +332,8 @@ struct CJabberProto : public PROTO, public IJabberInterface //---- jabber_captcha.cpp ------------------------------------------------------------ - void sendCaptchaResult(TCHAR* buf, ThreadData* info, LPCTSTR from, LPCTSTR challenge, LPCTSTR fromjid, LPCTSTR sid); - void sendCaptchaError(ThreadData* info, LPCTSTR from, LPCTSTR to, LPCTSTR challenge); + void sendCaptchaResult(TCHAR* buf, ThreadData *info, LPCTSTR from, LPCTSTR challenge, LPCTSTR fromjid, LPCTSTR sid); + void sendCaptchaError(ThreadData *info, LPCTSTR from, LPCTSTR to, LPCTSTR challenge); //---- jabber_chat.cpp --------------------------------------------------------------- @@ -491,7 +490,7 @@ struct CJabberProto : public PROTO, public IJabberInterface void OnIqResultSetSearch(HXML iqNode, CJabberIqInfo *pInfo); void OnIqResultSetVcard(HXML iqNode, CJabberIqInfo *pInfo); void OnIqResultVersion(HXML node, CJabberIqInfo *pInfo); - void OnProcessLoginRq(ThreadData* info, DWORD rq); + void OnProcessLoginRq(ThreadData *info, DWORD rq); void OnLoggedIn(void); //---- jabber_iq_handlers.cpp ------------------------------------------------------- @@ -719,7 +718,7 @@ struct CJabberProto : public PROTO, public IJabberInterface AUTHMECHS m_AuthMechs; - void __cdecl ServerThread(ThreadData* info); + void __cdecl ServerThread(JABBER_CONN_DATA *info); void OnProcessFailure(HXML node, ThreadData *info); void OnProcessError(HXML node, ThreadData *info); @@ -738,17 +737,17 @@ struct CJabberProto : public PROTO, public IJabberInterface void UpdateJidDbSettings(const TCHAR *jid); MCONTACT CreateTemporaryContact(const TCHAR *szJid, JABBER_LIST_ITEM* chatItem); - void PerformRegistration(ThreadData* info); - void PerformIqAuth(ThreadData* info); - void PerformAuthentication(ThreadData* info); - void OnProcessFeatures(HXML node, ThreadData* info); + void PerformRegistration(ThreadData *info); + void PerformIqAuth(ThreadData *info); + void PerformAuthentication(ThreadData *info); + void OnProcessFeatures(HXML node, ThreadData *info); void xmlStreamInitialize(char *which); - void xmlStreamInitializeNow(ThreadData* info); + void xmlStreamInitializeNow(ThreadData *info); BOOL OnProcessJingle(HXML node); void OnProcessIq(HXML node); - void OnProcessRegIq(HXML node, ThreadData* info); + void OnProcessRegIq(HXML node, ThreadData *info); void OnPingReply(HXML node, CJabberIqInfo *pInfo); bool ProcessCaptcha(HXML node, HXML parentNode, ThreadData *info); -- cgit v1.2.3