diff options
| -rw-r--r-- | utilities.cpp | 21 | ||||
| -rw-r--r-- | utilities.h | 6 |
2 files changed, 13 insertions, 14 deletions
diff --git a/utilities.cpp b/utilities.cpp index 1ddb504..545881d 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -78,9 +78,9 @@ int HandleNewContact(WPARAM w, LPARAM l) IJabberNetInterface *ijnet = acc->JabberInterface->Net(); if(!acc->hPrescenseHandler && !acc->hMessageHandler && !acc->hIqHandler) { - acc->hPrescenseHandler = ijnet->AddPresenceHandler(acc->PrescenseHandler()); - acc->hMessageHandler = ijnet->AddMessageHandler(acc->MessageHandler(), JABBER_MESSAGE_TYPE_ANY, _T(""), _T("")); //hm... - acc->hIqHandler = ijnet->AddIqHandler(acc->IqHandler(), JABBER_IQ_TYPE_ANY, _T(""), _T("")); //hm... + acc->hPrescenseHandler = ijnet->AddPresenceHandler(acc->PrescenseHandler(acc->JabberInterface, 0, 0)); //hm.. + acc->hMessageHandler = ijnet->AddMessageHandler(acc->MessageHandler(acc->JabberInterface, 0, 0), JABBER_MESSAGE_TYPE_ANY, 0, 0); //hm... + acc->hIqHandler = ijnet->AddIqHandler(acc->IqHandler(acc->JabberInterface, 0, 0), JABBER_IQ_TYPE_ANY, 0, 0); //hm... } } else if (acc->hPrescenseHandler && acc->hMessageHandler && acc->hIqHandler) @@ -103,33 +103,32 @@ void FindJuickAccounts() JabberAccount *acc = &Accounts; if(!acc) break; - IJabberSysInterface *ijsys; - ijsys = acc->JabberInterface->Sys(); + IJabberSysInterface *ijsys = acc->JabberInterface->Sys(); if(ijsys->ContactFromJID(_T(JUICK_JID))) { IJabberNetInterface *ijnet = acc->JabberInterface->Net(); if(!acc->hPrescenseHandler && !acc->hMessageHandler && !acc->hIqHandler) { - acc->hPrescenseHandler = ijnet->AddPresenceHandler(acc->PrescenseHandler()); - acc->hMessageHandler = ijnet->AddMessageHandler(acc->MessageHandler(), JABBER_MESSAGE_TYPE_ANY, _T(""), _T("")); //hm... - acc->hIqHandler = ijnet->AddIqHandler(acc->IqHandler(), JABBER_IQ_TYPE_ANY, _T(""), _T("")); //hm... + acc->hPrescenseHandler = ijnet->AddPresenceHandler(acc->PrescenseHandler(acc->JabberInterface, 0, 0)); + acc->hMessageHandler = ijnet->AddMessageHandler(acc->MessageHandler(acc->JabberInterface, 0, 0), JABBER_MESSAGE_TYPE_ANY, 0, 0); //hm... + acc->hIqHandler = ijnet->AddIqHandler(acc->IqHandler(acc->JabberInterface, 0, 0), JABBER_IQ_TYPE_ANY, 0, 0); //hm... } } acc = acc->next; } } -JABBER_HANDLER_FUNC JabberAccount::PrescenseHandler() +JABBER_HANDLER_FUNC JabberAccount::PrescenseHandler(IJabberInterface *ji, HXML node, void *pUserData) { return FALSE; } -JABBER_HANDLER_FUNC JabberAccount::MessageHandler() +JABBER_HANDLER_FUNC JabberAccount::MessageHandler(IJabberInterface *ji, HXML node, void *pUserData) { return FALSE; } -JABBER_HANDLER_FUNC JabberAccount::IqHandler() +JABBER_HANDLER_FUNC JabberAccount::IqHandler(IJabberInterface *ji, HXML node, void *pUserData) { return FALSE; } diff --git a/utilities.h b/utilities.h index dfddf3d..4870696 100644 --- a/utilities.h +++ b/utilities.h @@ -9,9 +9,9 @@ public: int AccountNumber; IJabberInterface *JabberInterface; HJHANDLER hPrescenseHandler, hMessageHandler, hIqHandler; - JABBER_HANDLER_FUNC PrescenseHandler(); - JABBER_HANDLER_FUNC MessageHandler(); - JABBER_HANDLER_FUNC IqHandler(); + JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, void *pUserData); + JABBER_HANDLER_FUNC MessageHandler(IJabberInterface *ji, HXML node, void *pUserData); + JABBER_HANDLER_FUNC IqHandler(IJabberInterface *ji, HXML node, void *pUserData); class JabberAccount *next; BOOL operator !(); }; |