diff options
| author | George Hazan <ghazan@miranda.im> | 2019-04-17 22:43:05 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-04-17 22:43:05 +0300 |
| commit | 52c70f4d3213b82a19e42310f046abd1ebb21cc4 (patch) | |
| tree | f19e72522a550643e7185b36417868f7c6e2c0b7 /protocols/ICQ-WIM/src/proto.h | |
| parent | a455e6fe10fb1f60bc37b0585b9a55fc25597931 (diff) | |
merge with trunk
Diffstat (limited to 'protocols/ICQ-WIM/src/proto.h')
| -rw-r--r-- | protocols/ICQ-WIM/src/proto.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h index b560335ce0..7461dcdd6c 100644 --- a/protocols/ICQ-WIM/src/proto.h +++ b/protocols/ICQ-WIM/src/proto.h @@ -133,7 +133,7 @@ struct IcqFileTransfer : public MZeroedObject void FillHeaders(AsyncHttpRequest *pReq) { pReq->AddHeader("Content-Type", "application/octet-stream"); - pReq->AddHeader("Content-Disposition", CMStringA(FORMAT, "attachment; filename=\"%s\"", T2Utf(m_wszShortName))); + pReq->AddHeader("Content-Disposition", CMStringA(FORMAT, "attachment; filename=\"%s\"", T2Utf(m_wszShortName).get())); DWORD dwPortion = pfts.currentFileSize - pfts.currentFileProgress; if (dwPortion > 1000000) @@ -209,7 +209,6 @@ class CIcqProto : public PROTO<CIcqProto> void OnLoginViaPhone(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void OnNormalizePhone(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void OnReceiveAvatar(NETLIBHTTPREQUEST*, AsyncHttpRequest*); - void OnRefreshEditIgnore(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void OnSearchResults(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void OnSendMessage(NETLIBHTTPREQUEST*, AsyncHttpRequest*); void OnStartSession(NETLIBHTTPREQUEST*, AsyncHttpRequest*); @@ -246,6 +245,8 @@ class CIcqProto : public PROTO<CIcqProto> int m_unreadEmails = -1; CMStringA m_szMailBox; + bool m_bIgnoreListEmpty = true; + //////////////////////////////////////////////////////////////////////////////////////// // group chats @@ -302,7 +303,6 @@ class CIcqProto : public PROTO<CIcqProto> INT_PTR __cdecl SetAvatar(WPARAM, LPARAM); INT_PTR __cdecl CreateAccMgrUI(WPARAM, LPARAM); - INT_PTR __cdecl EditIgnoreList(WPARAM, LPARAM); INT_PTR __cdecl GetEmailCount(WPARAM, LPARAM); INT_PTR __cdecl GotoInbox(WPARAM, LPARAM); INT_PTR __cdecl UploadGroups(WPARAM, LPARAM); @@ -365,7 +365,6 @@ public: { return time(0) - m_iTimeShift; } - int __cdecl OnContactMenu(WPARAM, LPARAM); void SetPermitDeny(const CMStringW &userId, bool bAllow); }; @@ -373,8 +372,6 @@ struct CMPlugin : public ACCPROTOPLUGIN<CIcqProto> { CMPlugin(); - HGENMENU m_hmiRoot, m_hmiIgnore, m_hmiAllow; - int Load() override; int Unload() override; }; |