From e7ca07ff3871bb91337f50adce8274f0eee43f26 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 19 May 2018 14:10:37 +0300 Subject: merge with master till fixes #1368 (Hide dbx_mmap from profile manager) --- plugins/AVS/src/poll.cpp | 1 - plugins/CloudFile/src/cloud_file.cpp | 3 +-- plugins/Dbx_mdbx/src/init.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp index 60f9480438..c004765f03 100644 --- a/plugins/AVS/src/poll.cpp +++ b/plugins/AVS/src/poll.cpp @@ -42,7 +42,6 @@ ACKRESULT_STATUS. This thread only requests the avatar (and maybe add it to the static void RequestThread(void *vParam); -extern HANDLE hShutdownEvent; extern void MakePathRelative(MCONTACT hContact, wchar_t *path); int Proto_GetDelayAfterFail(const char *proto); BOOL Proto_IsFetchingWhenProtoNotVisibleAllowed(const char *proto); diff --git a/plugins/CloudFile/src/cloud_file.cpp b/plugins/CloudFile/src/cloud_file.cpp index 2c019cbd96..13ba742690 100644 --- a/plugins/CloudFile/src/cloud_file.cpp +++ b/plugins/CloudFile/src/cloud_file.cpp @@ -3,8 +3,7 @@ CCloudService::CCloudService(const char *protoName, const wchar_t *userName) : PROTO(protoName, userName) { - MUUID muidLast = MIID_LAST; - m_hLangpack = GetPluginLangId(muidLast, 0); + m_hLangpack = GetPluginLangId(MIID_LAST, 0); NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; diff --git a/plugins/Dbx_mdbx/src/init.cpp b/plugins/Dbx_mdbx/src/init.cpp index 2500cd30ad..9b3c38d17e 100644 --- a/plugins/Dbx_mdbx/src/init.cpp +++ b/plugins/Dbx_mdbx/src/init.cpp @@ -93,7 +93,7 @@ static MDatabaseCommon* loadDatabase(const TCHAR *profile, BOOL bReadOnly) static DATABASELINK dblink = { - MDB_CAPS_COMPACT, + MDB_CAPS_COMPACT | MDB_CAPS_CREATE, "dbx_mdbx", L"MDBX database driver", makeDatabase, -- cgit v1.2.3