summaryrefslogtreecommitdiff
path: root/plugins/Dropbox/src
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-03-28 14:55:06 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-03-28 14:55:06 +0300
commit1e49d6b2cb3812d8e80051cbb3d44891e6532825 (patch)
tree2ffb8e36641e063d625faece1d380f4ce833d1a6 /plugins/Dropbox/src
parenteccbb5307a048e70ac4adb0d3fd333be28245fa8 (diff)
funny, but without cbSize we have no need in MessageWindowInputData at all
Diffstat (limited to 'plugins/Dropbox/src')
-rw-r--r--plugins/Dropbox/src/dropbox_events.cpp7
-rw-r--r--plugins/Dropbox/src/dropbox_options.cpp7
-rw-r--r--plugins/Dropbox/src/dropbox_utils.cpp6
3 files changed, 3 insertions, 17 deletions
diff --git a/plugins/Dropbox/src/dropbox_events.cpp b/plugins/Dropbox/src/dropbox_events.cpp
index 13413a56dd..8ed963d51e 100644
--- a/plugins/Dropbox/src/dropbox_events.cpp
+++ b/plugins/Dropbox/src/dropbox_events.cpp
@@ -109,14 +109,9 @@ int CDropbox::OnProtoAck(WPARAM, LPARAM lParam)
WORD status = ack->lParam;
bool canSendOffline = (CallProtoService(ack->szModule, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_IMSENDOFFLINE) > 0;
- MessageWindowInputData msgwi;
- msgwi.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
-
for (MCONTACT hContact = db_find_first(ack->szModule); hContact; hContact = db_find_next(hContact, ack->szModule)) {
- msgwi.hContact = hContact;
-
MessageWindowData msgw;
- if (!CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&msgwi, (LPARAM)&msgw) && msgw.uState & MSG_WINDOW_STATE_EXISTS) {
+ if (!CallService(MS_MSG_GETWINDOWDATA, hContact, (LPARAM)&msgw) && msgw.uState & MSG_WINDOW_STATE_EXISTS) {
BBButton bbd = {};
bbd.pszModuleName = MODULE;
bbd.dwButtonID = BBB_ID_FILE_SEND;
diff --git a/plugins/Dropbox/src/dropbox_options.cpp b/plugins/Dropbox/src/dropbox_options.cpp
index 68c6d0316e..2ce64cca26 100644
--- a/plugins/Dropbox/src/dropbox_options.cpp
+++ b/plugins/Dropbox/src/dropbox_options.cpp
@@ -123,14 +123,9 @@ void CDropboxOptionsInterception::OnApply()
interceptedProtos.AppendFormat("%s\t", acc->szModuleName);
// hide tabsrmm button for intercepted accounts
- MessageWindowInputData msgwi;
- msgwi.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
-
for (MCONTACT hContact = db_find_first(acc->szModuleName); hContact; hContact = db_find_next(hContact, acc->szModuleName)) {
- msgwi.hContact = hContact;
-
MessageWindowData msgw;
- if (!CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&msgwi, (LPARAM)&msgw) && msgw.uState & MSG_WINDOW_STATE_EXISTS) {
+ if (!CallService(MS_MSG_GETWINDOWDATA, hContact, (LPARAM)&msgw) && msgw.uState & MSG_WINDOW_STATE_EXISTS) {
BBButton bbd = {};
bbd.pszModuleName = MODULE;
bbd.dwButtonID = BBB_ID_FILE_SEND;
diff --git a/plugins/Dropbox/src/dropbox_utils.cpp b/plugins/Dropbox/src/dropbox_utils.cpp
index ad6bfa5af4..4872e917f4 100644
--- a/plugins/Dropbox/src/dropbox_utils.cpp
+++ b/plugins/Dropbox/src/dropbox_utils.cpp
@@ -116,12 +116,8 @@ void CDropbox::SendToContact(MCONTACT hContact, const wchar_t *data)
void CDropbox::PasteToInputArea(MCONTACT hContact, const wchar_t *data)
{
- MessageWindowInputData mwid = { sizeof(MessageWindowInputData) };
- mwid.hContact = hContact;
- mwid.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
-
MessageWindowData mwd = { sizeof(MessageWindowData) };
- if (!CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&mwid, (LPARAM)&mwd)) {
+ if (!CallService(MS_MSG_GETWINDOWDATA, hContact, (LPARAM)&mwd)) {
HWND hEdit = GetDlgItem(mwd.hwndWindow, 1002 /*IDC_MESSAGE*/);
if (!hEdit) hEdit = GetDlgItem(mwd.hwndWindow, 1009 /*IDC_CHATMESSAGE*/);