diff options
| -rw-r--r-- | utilities.cpp | 23 | ||||
| -rw-r--r-- | utilities.h | 5 |
2 files changed, 14 insertions, 14 deletions
diff --git a/utilities.cpp b/utilities.cpp index afac552..957acbb 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -78,6 +78,10 @@ int GetJabberInterface(WPARAM, LPARAM) //get interface for all jabber accounts, return 0; } +static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, void *pUserData); +static JABBER_HANDLER_FUNC MessageHandler(IJabberInterface *ji, HXML node, void *pUserData); +static JABBER_HANDLER_FUNC IqHandler(IJabberInterface *ji, HXML node, void *pUserData); + int HandleDbNewContact(WPARAM w, LPARAM l) { for(int i = 0; i < GetAccountsCount(); i++) @@ -94,9 +98,9 @@ int HandleDbNewContact(WPARAM w, LPARAM l) if(!acc->hPrescenseHandler && !acc->hMessageHandler && !acc->hIqHandler) { IJabberNetInterface *ijnet = acc->JabberInterface->Net(); - acc->hPrescenseHandler = ijnet->AddPresenceHandler(acc->PrescenseHandler(acc->JabberInterface, acc->pNODE, acc->ppUserData)); - acc->hMessageHandler = ijnet->AddMessageHandler(acc->MessageHandler(acc->JabberInterface, acc->mNODE, acc->mpUserData), JABBER_MESSAGE_TYPE_ANY, 0, 0); //hm... - acc->hIqHandler = ijnet->AddIqHandler(acc->IqHandler(acc->JabberInterface, acc->iNODE, acc->ipUserData), JABBER_IQ_TYPE_ANY, 0, 0); //hm... + acc->hPrescenseHandler = ijnet->AddPresenceHandler((JABBER_HANDLER_FUNC)PrescenseHandler); + acc->hMessageHandler = ijnet->AddMessageHandler((JABBER_HANDLER_FUNC)MessageHandler, JABBER_MESSAGE_TYPE_ANY, 0, 0); + acc->hIqHandler = ijnet->AddIqHandler((JABBER_HANDLER_FUNC)IqHandler, JABBER_IQ_TYPE_ANY, 0, 0); } } } @@ -145,26 +149,27 @@ void FindJuickAccounts() if(!acc->hPrescenseHandler && !acc->hMessageHandler && !acc->hIqHandler) { IJabberNetInterface *ijnet = acc->JabberInterface->Net(); - acc->hPrescenseHandler = ijnet->AddPresenceHandler(acc->PrescenseHandler(acc->JabberInterface, acc->pNODE, acc->ppUserData)); - acc->hMessageHandler = ijnet->AddMessageHandler(acc->MessageHandler(acc->JabberInterface, acc->mNODE, acc->mpUserData), JABBER_MESSAGE_TYPE_ANY, 0, 0); //hm... - acc->hIqHandler = ijnet->AddIqHandler(acc->IqHandler(acc->JabberInterface, acc->iNODE, acc->ipUserData), JABBER_IQ_TYPE_ANY, 0, 0); //hm... + acc->hPrescenseHandler = ijnet->AddPresenceHandler((JABBER_HANDLER_FUNC)PrescenseHandler); + acc->hMessageHandler = ijnet->AddMessageHandler((JABBER_HANDLER_FUNC)MessageHandler, JABBER_MESSAGE_TYPE_ANY, 0, 0); + acc->hIqHandler = ijnet->AddIqHandler((JABBER_HANDLER_FUNC)IqHandler, JABBER_IQ_TYPE_ANY, 0, 0); } } acc = acc->next; } } -JABBER_HANDLER_FUNC JabberAccount::PrescenseHandler(IJabberInterface *ji, HXML node, void *pUserData) +//static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, void *pUserData) +static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, void *pUserData) { return FALSE; } -JABBER_HANDLER_FUNC JabberAccount::MessageHandler(IJabberInterface *ji, HXML node, void *pUserData) +static JABBER_HANDLER_FUNC MessageHandler(IJabberInterface *ji, HXML node, void *pUserData) { return FALSE; } -JABBER_HANDLER_FUNC JabberAccount::IqHandler(IJabberInterface *ji, HXML node, void *pUserData) +static JABBER_HANDLER_FUNC IqHandler(IJabberInterface *ji, HXML node, void *pUserData) { return FALSE; } diff --git a/utilities.h b/utilities.h index f9d492b..9ddf044 100644 --- a/utilities.h +++ b/utilities.h @@ -24,11 +24,6 @@ public: int AccountNumber; IJabberInterface *JabberInterface; HJHANDLER hPrescenseHandler, hMessageHandler, hIqHandler; - 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); - HXML pNODE, mNODE, iNODE; - void *ppUserData, *mpUserData, *ipUserData; class JabberAccount *next; BOOL operator !(); }; |