From 3342dd204597c09bb726dfc1d7a0acbfd2fd5d8f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 15 Aug 2017 15:31:06 +0300 Subject: anonymous SRMM services got names --- protocols/MSN/src/msn_chat.cpp | 13 +++---------- protocols/VKontakte/src/vk_feed.cpp | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'protocols') 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; -- cgit v1.2.3