From ba456be50d3b780e4accf075ba78d5badf282b05 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 21 Jun 2015 19:09:56 +0000 Subject: MS_UTIL_OPENURL -> mir_core::Utils_OpenUrl git-svn-id: http://svn.miranda-ng.org/main/trunk@14306 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Twitter/src/connection.cpp | 7 +++---- protocols/Twitter/src/proto.cpp | 2 +- protocols/Twitter/src/ui.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'protocols/Twitter/src') diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index 23d6e15e33..fcd515f43e 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -497,10 +497,9 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM case WM_COMMAND: // Get the plugin data (we need the Popup service to do it) url = (std::string *)PUGetPluginData(hwnd); - if (url != NULL) { - //std::string url = profile_base_url("https://twitter.com/") + http::url_encode(dbv.pszVal); - CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, reinterpret_cast(url->c_str())); - } + if (url != NULL) + Utils_OpenUrl(url->c_str()); + // Intentionally no break here case WM_CONTEXTMENU: diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index c9bd871c80..fd3ba76d75 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -241,7 +241,7 @@ INT_PTR TwitterProto::VisitHomepage(WPARAM hContact, LPARAM) std::string url = profile_base_url("https://twitter.com/") + http::url_encode(dbv.pszVal); db_set_s(hContact, m_szModuleName, "Homepage", url.c_str()); - CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, reinterpret_cast(url.c_str())); + Utils_OpenUrl(url.c_str()); db_free(&dbv); } diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp index 71dbb239c9..dd6cb1a567 100644 --- a/protocols/Twitter/src/ui.cpp +++ b/protocols/Twitter/src/ui.cpp @@ -62,7 +62,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM case WM_COMMAND: if (LOWORD(wParam) == IDC_NEWACCOUNTLINK) { - CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, reinterpret_cast("https://twitter.com/signup")); + Utils_OpenUrl("https://twitter.com/signup"); return true; } -- cgit v1.2.3