Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-05-11 11:05:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source 
Conflicts:
	src/CMakeLists.txt
	src/autotype/xcb/AutoTypeXCB.cpp
	src/browser/BrowserAction.cpp
	src/browser/BrowserService.cpp
	src/browser/BrowserService.h
	src/browser/BrowserSettings.h
	src/browser/NativeMessagingHost.cpp
	src/browser/NativeMessagingHost.h
	src/gui/EditWidgetIcons.cpp
	src/gui/EditWidgetIcons.h
	src/gui/MainWindow.cpp
	src/proxy/NativeMessagingHost.cpp
	tests/TestOpenSSHKey.cpp
This commit is contained in:
Jonathan White 2018-05-07 23:22:59 -04:00
commit aae6d09fd3
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
53 changed files with 9771 additions and 1125 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/proxy/NativeMessagingHost.cpp
View file

@ -18,11 +18,21 @@
#include "NativeMessagingHost.h"
#include <QCoreApplication>
NativeMessagingHost::NativeMessagingHost()
: NativeMessagingBase()
#ifdef Q_OS_WIN
#include <Winsock2.h>
#endif
NativeMessagingHost::NativeMessagingHost() : NativeMessagingBase(true)
{
m_localSocket = new QLocalSocket();
m_localSocket->connectToServer(getLocalServerPath());
m_localSocket->setReadBufferSize(NATIVE_MSG_MAX_LENGTH);
int socketDesc = m_localSocket->socketDescriptor();
if (socketDesc) {
int max = NATIVE_MSG_MAX_LENGTH;
setsockopt(socketDesc, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<char*>(&max), sizeof(max));
}
#ifdef Q_OS_WIN
m_running.store(true);
m_future =