chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-05-13 17:34:10 +02:00
Code

SocketApi: Fix

Browse Source
This commit is contained in:
Markus Goetz 2018-08-31 15:03:33 +02:00 committed by Kevin Ottens
parent 2f7cdb81cf
commit 5da48a5239
No known key found for this signature in database
GPG Key ID: 074BBBCB8DECC9E2
1 changed files with 15 additions and 6 deletions

21
src/gui/socketapi.cpp
View File

@ -58,6 +58,9 @@
#include <QStandardPaths>
#ifdef Q_OS_MAC
#include <CoreFoundation/CoreFoundation.h>
#endif
// This is the version that is returned when the client asks for the VERSION.
// The first number should be changed if there is an incompatible change that breaks old clients.
@ -198,8 +201,19 @@ SocketApi::SocketApi(QObject *parent)
// Example for official signed packages: "9B5WD74GWJ." "com.owncloud.desktopclient" ".socketApi"
socketPath = SOCKETAPI_TEAM_IDENTIFIER_PREFIX APPLICATION_REV_DOMAIN ".socketApi";
#ifdef Q_OS_MAC
int ret = 0;
CFURLRef url = (CFURLRef)CFAutorelease((CFURLRef)CFBundleCopyBundleURL(CFBundleGetMainBundle()));
QString bundlePath = QUrl::fromCFURL(url).path();
QString cmd;
// Tell Finder to use the Extension (checking it from System Preferences -> Extensions)
system("pluginkit -e use -i " APPLICATION_REV_DOMAIN ".FinderSyncExt &");
cmd = QString("pluginkit -v -e use -i " APPLICATION_REV_DOMAIN ".FinderSyncExt");
ret = system(cmd.toLocal8Bit());
// Add it again. This was needed for Mojave to trigger a load.
cmd = QString("pluginkit -v -a ") + bundlePath + "Contents/PlugIns/FinderSyncExt.appex/";
ret = system(cmd.toLocal8Bit());
#endif
} else if (Utility::isLinux() || Utility::isBSD()) {
QString runtimeDir;
@ -238,11 +252,6 @@ SocketApi::~SocketApi()
// All remaining sockets will be destroyed with _localServer, their parent
ASSERT(_listeners.isEmpty() || _listeners.first().socket->parent() == &_localServer);
_listeners.clear();
#ifdef Q_OS_MAC
// Unload the extension (uncheck from System Preferences -> Extensions)
system("pluginkit -e ignore -i " APPLICATION_REV_DOMAIN ".FinderSyncExt &");
#endif
}
void SocketApi::slotNewConnection()