diff options
Diffstat (limited to 'protocols/MSN/src/msn_chat.cpp')
| -rw-r--r-- | protocols/MSN/src/msn_chat.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index 76688d5235..1ffd87f65d 100644 --- a/protocols/MSN/src/msn_chat.cpp +++ b/protocols/MSN/src/msn_chat.cpp @@ -25,13 +25,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "msn_proto.h"
#include <m_history.h>
-HCONTACT CMsnProto::MSN_GetChatInernalHandle(HCONTACT hContact)
+MCONTACT CMsnProto::MSN_GetChatInernalHandle(MCONTACT hContact)
{
- HCONTACT result = hContact;
+ MCONTACT result = hContact;
if ( isChatRoom(hContact)) {
DBVARIANT dbv;
if (getString(hContact, "ChatRoomID", &dbv) == 0) {
- result = (HCONTACT)(-atol(dbv.pszVal));
+ result = (MCONTACT)(-atol(dbv.pszVal));
db_free(&dbv);
}
}
@@ -98,7 +98,7 @@ void CMsnProto::MSN_ChatStart(ThreadData* info) for (int j=0; j < info->mJoinedContactsWLID.getCount(); j++)
{
- HCONTACT hContact = MSN_HContactFromEmail(info->mJoinedContactsWLID[j]);
+ MCONTACT hContact = MSN_HContactFromEmail(info->mJoinedContactsWLID[j]);
TCHAR *wlid = mir_a2t(info->mJoinedContactsWLID[j]);
gce.ptszNick = GetContactNameT(hContact);
@@ -169,23 +169,23 @@ static void ChatInviteSend(HANDLE hItem, HWND hwndList, STRLIST &str, CMsnProto }
-static void ChatValidateContact(HCONTACT hItem, HWND hwndList, CMsnProto* ppro)
+static void ChatValidateContact(MCONTACT hItem, HWND hwndList, CMsnProto* ppro)
{
if (!ppro->MSN_IsMyContact(hItem) || ppro->isChatRoom(hItem) || ppro->MSN_IsMeByContact(hItem))
SendMessage(hwndList, CLM_DELETEITEM, (WPARAM)hItem, 0);
}
-static void ChatPrepare(HCONTACT hItem, HWND hwndList, CMsnProto* ppro)
+static void ChatPrepare(MCONTACT hItem, HWND hwndList, CMsnProto* ppro)
{
if (hItem == NULL)
- hItem = (HCONTACT)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_ROOT, 0);
+ hItem = (MCONTACT)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_ROOT, 0);
while (hItem)
{
- HCONTACT hItemN = (HCONTACT)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXT, (LPARAM)hItem);
+ MCONTACT hItemN = (MCONTACT)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXT, (LPARAM)hItem);
if (IsHContactGroup(hItem)) {
- HCONTACT hItemT = (HCONTACT)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);
+ MCONTACT hItemT = (MCONTACT)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);
if (hItemT)
ChatPrepare(hItemT, hwndList, ppro);
}
@@ -229,7 +229,7 @@ INT_PTR CALLBACK DlgInviteToChat(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l {
case CLN_NEWCONTACT:
if (param && (nmc->flags & (CLNF_ISGROUP | CLNF_ISINFO)) == 0)
- ChatValidateContact((HCONTACT)nmc->hItem, nmc->hdr.hwndFrom, param->ppro);
+ ChatValidateContact((MCONTACT)nmc->hItem, nmc->hdr.hwndFrom, param->ppro);
break;
case CLN_LISTREBUILT:
@@ -361,7 +361,7 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam) case GC_USER_PRIVMESS:
{
char *email = mir_t2a(gch->ptszUID);
- HCONTACT hContact = MSN_HContactFromEmail(email);
+ MCONTACT hContact = MSN_HContactFromEmail(email);
CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0);
mir_free(email);
break;
@@ -384,7 +384,7 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam) case GC_USER_NICKLISTMENU:
{
char *email = mir_t2a(gch->ptszUID);
- HCONTACT hContact = MSN_HContactFromEmail(email);
+ MCONTACT hContact = MSN_HContactFromEmail(email);
mir_free(email);
switch(gch->dwData)
|