summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/FacebookRM/src/avatars.cpp8
-rw-r--r--protocols/FacebookRM/src/captcha.cpp2
-rw-r--r--protocols/FacebookRM/src/chat.cpp6
-rw-r--r--protocols/FacebookRM/src/communication.cpp2
-rw-r--r--protocols/FacebookRM/src/contacts.cpp10
-rw-r--r--protocols/FacebookRM/src/json.cpp2
-rw-r--r--protocols/FacebookRM/src/proto.cpp6
7 files changed, 18 insertions, 18 deletions
diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp
index 15abcdd60f..047f9a29d2 100644
--- a/protocols/FacebookRM/src/avatars.cpp
+++ b/protocols/FacebookRM/src/avatars.cpp
@@ -76,11 +76,11 @@ void FacebookProto::CheckAvatarChange(MCONTACT hContact, const std::string &imag
if (!hContact) {
PROTO_AVATAR_INFORMATION ai = { 0 };
if (GetAvatarInfo(update_required ? GAIF_FORCE : 0, (LPARAM)&ai) != GAIR_WAITFOR)
- CallService(MS_AV_REPORTMYAVATARCHANGED, (WPARAM)m_szModuleName, 0);
+ CallService(MS_AV_REPORTMYAVATARCHANGED, (WPARAM)m_szModuleName);
}
else if (update_required) {
db_set_b(hContact, "ContactPhoto", "NeedUpdate", 1);
- ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, 0);
+ ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, 0);
}
}
@@ -110,9 +110,9 @@ void FacebookProto::UpdateAvatarWorker(void *)
bool success = facy.save_url(url + params, ai.filename, nlc);
if (ai.hContact)
- ProtoBroadcastAck(ai.hContact, ACKTYPE_AVATAR, success ? ACKRESULT_SUCCESS : ACKRESULT_FAILED, (HANDLE)&ai, 0);
+ ProtoBroadcastAck(ai.hContact, ACKTYPE_AVATAR, success ? ACKRESULT_SUCCESS : ACKRESULT_FAILED, (HANDLE)&ai);
else if (success)
- CallService(MS_AV_REPORTMYAVATARCHANGED, (WPARAM)m_szModuleName, 0);
+ CallService(MS_AV_REPORTMYAVATARCHANGED, (WPARAM)m_szModuleName);
}
ScopedLock s(avatar_lock_);
diff --git a/protocols/FacebookRM/src/captcha.cpp b/protocols/FacebookRM/src/captcha.cpp
index 98cc51bd1e..3d19823b03 100644
--- a/protocols/FacebookRM/src/captcha.cpp
+++ b/protocols/FacebookRM/src/captcha.cpp
@@ -128,7 +128,7 @@ bool FacebookProto::RunCaptchaForm(std::string captchaUrl, std::string &result)
memio.iLen = reply->dataLength;
memio.pBuf = reply->pData;
memio.fif = FIF_UNKNOWN; /* detect */
- param.bmp = (HBITMAP)CallService(MS_IMG_LOADFROMMEM, (WPARAM)&memio, 0);
+ param.bmp = (HBITMAP)CallService(MS_IMG_LOADFROMMEM, (WPARAM)&memio);
BITMAP bmp = { 0 };
GetObject(param.bmp, sizeof(bmp), &bmp);
diff --git a/protocols/FacebookRM/src/chat.cpp b/protocols/FacebookRM/src/chat.cpp
index e6e29ddb90..674bbae204 100644
--- a/protocols/FacebookRM/src/chat.cpp
+++ b/protocols/FacebookRM/src/chat.cpp
@@ -101,7 +101,7 @@ int FacebookProto::OnGCEvent(WPARAM, LPARAM lParam)
if (!hContact)
break;
- CallService(MS_MSG_SENDMESSAGET, hContact, 0);
+ CallService(MS_MSG_SENDMESSAGET, hContact);
break;
}
@@ -140,11 +140,11 @@ int FacebookProto::OnGCEvent(WPARAM, LPARAM lParam)
switch (hook->dwData)
{
case 10:
- CallService(MS_USERINFO_SHOWDIALOG, hContact, 0);
+ CallService(MS_USERINFO_SHOWDIALOG, hContact);
break;
case 20:
- CallService(MS_HISTORY_SHOWCONTACTHISTORY, hContact, 0);
+ CallService(MS_HISTORY_SHOWCONTACTHISTORY, hContact);
break;
case 110:
diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index 2c50763622..22cdff0cf2 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -695,7 +695,7 @@ void facebook_client::erase_reader(MCONTACT hContact)
parent->delSetting(hContact, FACEBOOK_KEY_MESSAGE_READ);
readers.erase(hContact);
- CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hContact, NULL);
+ CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hContact);
}
void loginError(FacebookProto *proto, std::string error_str) {
diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp
index 184713d917..7083a918ee 100644
--- a/protocols/FacebookRM/src/contacts.cpp
+++ b/protocols/FacebookRM/src/contacts.cpp
@@ -86,7 +86,7 @@ MCONTACT FacebookProto::ChatIDToHContact(const std::string &chat_id)
auto it = facy.chat_id_to_hcontact.find(chat_id);
if (it != facy.chat_id_to_hcontact.end()) {
// Check if contact is still valid
- if (CallService(MS_DB_CONTACT_IS, (WPARAM)it->second, 0) == 1)
+ if (CallService(MS_DB_CONTACT_IS, (WPARAM)it->second) == 1)
return it->second;
else
facy.chat_id_to_hcontact.erase(it);
@@ -118,7 +118,7 @@ MCONTACT FacebookProto::ContactIDToHContact(const std::string &user_id)
std::map<std::string, MCONTACT>::iterator it = facy.user_id_to_hcontact.find(user_id);
if (it != facy.user_id_to_hcontact.end()) {
// Check if contact is still valid
- if (CallService(MS_DB_CONTACT_IS, (WPARAM)it->second, 0) == 1)
+ if (CallService(MS_DB_CONTACT_IS, (WPARAM)it->second) == 1)
return it->second;
else
facy.user_id_to_hcontact.erase(it);
@@ -350,10 +350,10 @@ MCONTACT FacebookProto::AddToContactList(facebook_user* fbu, ContactType type, b
}
// Try to make a new contact
- MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
+ MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD);
if (hContact && Proto_AddToContact(hContact, m_szModuleName) != 0) {
- CallService(MS_DB_CONTACT_DELETE, hContact, 0);
+ CallService(MS_DB_CONTACT_DELETE, hContact);
hContact = NULL;
}
@@ -596,7 +596,7 @@ void FacebookProto::IgnoreFriendshipRequest(void *data)
// Delete this contact, if he's temporary
if (db_get_b(hContact, "CList", "NotOnList", 0))
- CallService(MS_DB_CONTACT_DELETE, hContact, 0);
+ CallService(MS_DB_CONTACT_DELETE, hContact);
}
else facy.client_notify(TranslateT("Error occurred when ignoring friendship request."));
diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp
index d8a43f9255..88bc191b59 100644
--- a/protocols/FacebookRM/src/json.cpp
+++ b/protocols/FacebookRM/src/json.cpp
@@ -693,7 +693,7 @@ int facebook_json_parser::parse_messages(std::string *data, std::vector< faceboo
CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hChatContact, (LPARAM)&st);
}
else {
- CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hChatContact, NULL);
+ CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hChatContact);
}
// TODO: support proper MS_PROTO_CONTACTISTYPING service for chatrooms (when it will be implemented)
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 5c14ce4f95..13d816fac3 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -156,7 +156,7 @@ DWORD_PTR FacebookProto::GetCaps(int type, MCONTACT)
{
DWORD_PTR flags = PF1_IM | PF1_CHAT | PF1_SERVERCLIST | PF1_AUTHREQ | /*PF1_ADDED |*/ PF1_BASICSEARCH | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME | PF1_ADDSEARCHRES; // | PF1_VISLIST | PF1_INVISLIST;
- if (getByte(FACEBOOK_KEY_SET_MIRANDA_STATUS, 0))
+ if (getByte(FACEBOOK_KEY_SET_MIRANDA_STATUS))
return flags |= PF1_MODEMSG;
else
return flags |= PF1_MODEMSGRECV;
@@ -164,7 +164,7 @@ DWORD_PTR FacebookProto::GetCaps(int type, MCONTACT)
case PFLAGNUM_2:
return PF2_ONLINE | PF2_INVISIBLE | PF2_ONTHEPHONE | PF2_IDLE; // | PF2_SHORTAWAY;
case PFLAGNUM_3:
- if (getByte(FACEBOOK_KEY_SET_MIRANDA_STATUS, 0))
+ if (getByte(FACEBOOK_KEY_SET_MIRANDA_STATUS))
return PF2_ONLINE; // | PF2_SHORTAWAY;
else
return 0;
@@ -761,7 +761,7 @@ INT_PTR FacebookProto::CancelFriendship(WPARAM wParam, LPARAM lParam)
MCONTACT hContact = MCONTACT(wParam);
// Ignore groupchats and, if deleting, also not-friends
- if (isChatRoom(hContact) || (deleting && getByte(hContact, FACEBOOK_KEY_CONTACT_TYPE, 0) != CONTACT_FRIEND))
+ if (isChatRoom(hContact) || (deleting && getByte(hContact, FACEBOOK_KEY_CONTACT_TYPE) != CONTACT_FRIEND))
return 0;
ptrT tname(getTStringA(hContact, FACEBOOK_KEY_NICK));
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:35:46 +0000