summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2010-06-14 16:04:57 +0300
committerGluzskiy Alexandr <sss123next@list.ru>2010-06-14 16:04:57 +0300
commit1d004cab41d582d8063664444c3cd9dfefc7051b (patch)
tree99f60b96bfa452b1f8e97b53510bca0f199cda8d
parent05980e01a9b5cc567f8d85d5b7d8ddd4a3fe0e8b (diff)
modified: utilities.cpp
modified: utilities.h
-rw-r--r--utilities.cpp12
-rw-r--r--utilities.h2
2 files changed, 8 insertions, 6 deletions
diff --git a/utilities.cpp b/utilities.cpp
index 545881d..4c9ff65 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->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...
+ 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...
}
}
else if (acc->hPrescenseHandler && acc->hMessageHandler && acc->hIqHandler)
@@ -109,9 +109,9 @@ void FindJuickAccounts()
IJabberNetInterface *ijnet = acc->JabberInterface->Net();
if(!acc->hPrescenseHandler && !acc->hMessageHandler && !acc->hIqHandler)
{
- 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->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 = acc->next;
diff --git a/utilities.h b/utilities.h
index 4870696..2a9646c 100644
--- a/utilities.h
+++ b/utilities.h
@@ -12,6 +12,8 @@ public:
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 !();
};