diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-21 19:09:56 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-21 19:09:56 +0000 |
| commit | ba456be50d3b780e4accf075ba78d5badf282b05 (patch) | |
| tree | a1e4a2df606b21f814306f7c0bfdef15d6de419b /protocols/VKontakte | |
| parent | a08db3aa08808c6adec9891d429f262126faca80 (diff) | |
MS_UTIL_OPENURL -> mir_core::Utils_OpenUrl
git-svn-id: http://svn.miranda-ng.org/main/trunk@14306 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/VKontakte')
| -rw-r--r-- | protocols/VKontakte/src/vk_chats.cpp | 7 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_options.cpp | 4 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_thread.cpp | 9 |
3 files changed, 9 insertions, 11 deletions
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp index 5b8b7f7b0f..ee65cb5714 100644 --- a/protocols/VKontakte/src/vk_chats.cpp +++ b/protocols/VKontakte/src/vk_chats.cpp @@ -792,10 +792,9 @@ void CVkProto::NickMenuHook(CVkChatInfo *cc, GCHOOK *gch) case IDM_VISIT_PROFILE:
hContact = FindUser(cu->m_uid);
- if (hContact == NULL) {
- CMString tszUrl(FORMAT, _T("http://vk.com/id%d"), cu->m_uid);
- CallService(MS_UTILS_OPENURL, (WPARAM)OUF_TCHAR, (LPARAM)tszUrl.GetBuffer());
- } else
+ if (hContact == NULL)
+ Utils_OpenUrlT(CMString(FORMAT, _T("http://vk.com/id%d"), cu->m_uid));
+ else
SvcVisitProfile(hContact, 0);
break;
diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp index 98a7e633aa..a21e27105e 100644 --- a/protocols/VKontakte/src/vk_options.cpp +++ b/protocols/VKontakte/src/vk_options.cpp @@ -47,7 +47,7 @@ INT_PTR CALLBACK VKAccountProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC_URL:
- CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://vk.com");
+ Utils_OpenUrl("http://vk.com");
break;
case IDC_LOGIN:
@@ -138,7 +138,7 @@ INT_PTR CALLBACK CVkProto::OptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC_URL:
- CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://vk.com");
+ Utils_OpenUrl("http://vk.com");
break;
case IDC_LOGIN:
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index ac81248d63..fe0b523837 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -696,10 +696,10 @@ INT_PTR __cdecl CVkProto::SvcReportAbuse(WPARAM hContact, LPARAM) INT_PTR __cdecl CVkProto::SvcOpenBroadcast(WPARAM hContact, LPARAM)
{
debugLogA("CVkProto::SvcOpenBroadcast");
+
CMString tszAudio(ptrT(db_get_tsa(hContact, m_szModuleName, "AudioUrl")));
-
if (!tszAudio.IsEmpty())
- CallService(MS_UTILS_OPENURL, (WPARAM)OUF_TCHAR, (LPARAM)tszAudio.GetBuffer());
+ Utils_OpenUrlT(tszAudio);
return 0;
}
@@ -709,14 +709,13 @@ INT_PTR __cdecl CVkProto::SvcVisitProfile(WPARAM hContact, LPARAM) debugLogA("CVkProto::SvcVisitProfile");
LONG userID = getDword(hContact, "ID", -1);
ptrT tszDomain(db_get_tsa(hContact, m_szModuleName, "domain"));
- CMString tszUrl("https://vk.com/");
+ CMString tszUrl("https://vk.com/");
if (tszDomain)
tszUrl.Append(tszDomain);
else
tszUrl.AppendFormat(_T("id%i"), userID);
- CallService(MS_UTILS_OPENURL, (WPARAM)OUF_TCHAR, (LPARAM)tszUrl.GetBuffer());
-
+ Utils_OpenUrlT(tszUrl);
return 0;
}
\ No newline at end of file |