summaryrefslogtreecommitdiff
path: root/protocols/Twitter/src/contacts.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/Twitter/src/contacts.cpp')
-rw-r--r--protocols/Twitter/src/contacts.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp
index dc3b2668ee..ce4795132b 100644
--- a/protocols/Twitter/src/contacts.cpp
+++ b/protocols/Twitter/src/contacts.cpp
@@ -154,25 +154,19 @@ HANDLE CTwitterProto::GetAwayMsg(MCONTACT hContact)
return (HANDLE)1;
}
-int CTwitterProto::OnContactDeleted(WPARAM wParam, LPARAM)
+void CTwitterProto::OnContactDeleted(MCONTACT hContact)
{
- MCONTACT hContact = (MCONTACT)wParam;
if (m_iStatus != ID_STATUS_ONLINE)
- return 0;
-
- if (!IsMyContact(hContact))
- return 0;
+ return;
- DBVARIANT dbv;
- if (!getString(hContact, TWITTER_KEY_UN, &dbv)) {
+ ptrA szId(getStringA(hContact, TWITTER_KEY_UN));
+ if (szId) {
if (m_si)
- DeleteChatContact(dbv.pszVal);
+ DeleteChatContact(szId);
mir_cslock s(twitter_lock_);
- remove_friend(dbv.pszVal); // Be careful about this until Miranda is fixed
- db_free(&dbv);
+ remove_friend(szId.get()); // Be careful about this until Miranda is fixed
}
- return 0;
}
int CTwitterProto::OnMarkedRead(WPARAM, LPARAM hDbEvent)