diff options
| author | George Hazan <ghazan@miranda.im> | 2019-03-05 21:10:22 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-05 21:10:22 +0300 |
| commit | d9fddc0cfa9066eb1b5ad3f4807b37426ae6ca88 (patch) | |
| tree | f09baaf9b91477d009cedc5bd77449b0fa3e3af7 /protocols/Twitter/src | |
| parent | 8a1ff32e54b39ceef22df61bda17bbfda94918fc (diff) | |
Popup:
- wiping out checks for service presence;
- code cleaning
Diffstat (limited to 'protocols/Twitter/src')
| -rw-r--r-- | protocols/Twitter/src/connection.cpp | 3 | ||||
| -rw-r--r-- | protocols/Twitter/src/proto.cpp | 22 |
2 files changed, 7 insertions, 18 deletions
diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index 195fca892f..096ef0bb4c 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -484,9 +484,8 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM void TwitterProto::ShowContactPopup(MCONTACT hContact, const std::string &text, const std::string *url)
{
- if (!ServiceExists(MS_POPUP_ADDPOPUPW) || getByte(TWITTER_KEY_POPUP_SHOW) == 0) {
+ if (!getByte(TWITTER_KEY_POPUP_SHOW))
return;
- }
POPUPDATAW popup = {};
popup.lchContact = hContact;
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 2664441c12..8ff0f75444 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -279,12 +279,10 @@ int TwitterProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.pfnDlgProc = options_proc;
g_plugin.addOptions(wParam, &odp);
- if (ServiceExists(MS_POPUP_ADDPOPUPW)) {
- odp.szTab.w = LPGENW("Popups");
- odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS);
- odp.pfnDlgProc = popup_options_proc;
- g_plugin.addOptions(wParam, &odp);
- }
+ odp.szTab.w = LPGENW("Popups");
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS);
+ odp.pfnDlgProc = popup_options_proc;
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
@@ -344,11 +342,7 @@ void TwitterProto::ShowPopup(const wchar_t *text, int Error) popup.colorBack = 0x000000FF;
popup.colorText = 0x00FFFFFF;
}
-
- if (ServiceExists(MS_POPUP_ADDPOPUPW))
- PUAddPopupW(&popup);
- else
- MessageBox(nullptr, popup.lpwzText, popup.lpwzContactName, 0);
+ PUAddPopupW(&popup);
}
void TwitterProto::ShowPopup(const char *text, int Error)
@@ -361,11 +355,7 @@ void TwitterProto::ShowPopup(const char *text, int Error) popup.colorBack = 0x000000FF;
popup.colorText = 0x00FFFFFF;
}
-
- if (ServiceExists(MS_POPUP_ADDPOPUPW))
- PUAddPopupW(&popup);
- else
- MessageBox(nullptr, popup.lpwzText, popup.lpwzContactName, 0);
+ PUAddPopupW(&popup);
}
/////////////////////////////////////////////////////////////////////////////////////////
|