summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-08-15 15:31:06 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-08-15 15:31:06 +0300
commit3342dd204597c09bb726dfc1d7a0acbfd2fd5d8f (patch)
tree03d29ca3ad2c9918314f92ccfdbb515ecd510aa7 /protocols
parentf52b5cc86d9eff2494902157c8fc0a4e019a3c95 (diff)
anonymous SRMM services got names
Diffstat (limited to 'protocols')
-rw-r--r--protocols/MSN/src/msn_chat.cpp13
-rw-r--r--protocols/VKontakte/src/vk_feed.cpp2
2 files changed, 4 insertions, 11 deletions
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp
index 9653c829b4..d6983751a5 100644
--- a/protocols/MSN/src/msn_chat.cpp
+++ b/protocols/MSN/src/msn_chat.cpp
@@ -506,12 +506,7 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam)
break;
case GC_USER_PRIVMESS:
- {
- char *email = mir_u2a(gch->ptszUID);
- MCONTACT hContact = MSN_HContactFromEmail(email);
- CallService(MS_MSG_SENDMESSAGE, hContact, 0);
- mir_free(email);
- }
+ CallService(MS_MSG_SENDMESSAGE, MSN_HContactFromEmail(_T2A(gch->ptszUID)), 0);
break;
case GC_USER_LOGMENU:
@@ -528,15 +523,13 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam)
break;
case GC_USER_NICKLISTMENU:
- MCONTACT hContact = MSN_HContactFromEmail(_T2A(gch->ptszUID));
-
switch (gch->dwData) {
case 10:
- CallService(MS_USERINFO_SHOWDIALOG, hContact, 0);
+ CallService(MS_USERINFO_SHOWDIALOG, MSN_HContactFromEmail(_T2A(gch->ptszUID)), 0);
break;
case 20:
- CallService(MS_HISTORY_SHOWCONTACTHISTORY, hContact, 0);
+ CallService(MS_HISTORY_SHOWCONTACTHISTORY, MSN_HContactFromEmail(_T2A(gch->ptszUID)), 0);
break;
case 30:
diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp
index b0ba6ce84f..9c8c61f073 100644
--- a/protocols/VKontakte/src/vk_feed.cpp
+++ b/protocols/VKontakte/src/vk_feed.cpp
@@ -80,7 +80,7 @@ void CVkProto::AddCListEvent(bool bNews)
CLISTEVENT cle = {};
cle.hIcon = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));
- cle.pszService = "SRMsg/ReadMessage";
+ cle.pszService = MS_MSG_READMESSAGE;
cle.flags = CLEF_URGENT | CLEF_UNICODE;
cle.hContact = hContact;
cle.hDbEvent = NULL;