mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 06:45:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Prepend PLUGINDIR else its pointless

Browse source
This commit is contained in:
Hannah von Reth 2019-12-04 13:21:17 +01:00 committed by Kevin Ottens
parent b6e8d47644
commit 3317e354f2
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/vfs.cpp
View file

@ -136,21 +136,21 @@ bool OCC::isVfsPluginAvailable(Vfs::Mode mode)
auto basemeta = loader.metaData();
if (basemeta.isEmpty() || !basemeta.contains("IID")) {
qCDebug(lcPlugin) << "Plugin doesn't exist" << pluginPath;
qCDebug(lcPlugin) << "Plugin doesn't exist" << loader.fileName();
return false;
}
if (basemeta["IID"].toString() != "org.owncloud.PluginFactory") {
qCWarning(lcPlugin) << "Plugin has wrong IID" << pluginPath << basemeta["IID"];
qCWarning(lcPlugin) << "Plugin has wrong IID" << loader.fileName() << basemeta["IID"];
return false;
}
auto metadata = basemeta["MetaData"].toObject();
if (metadata["type"].toString() != "vfs") {
qCWarning(lcPlugin) << "Plugin has wrong type" << pluginPath << metadata["type"];
qCWarning(lcPlugin) << "Plugin has wrong type" << loader.fileName() << metadata["type"];
return false;
}
if (metadata["version"].toString() != MIRALL_VERSION_STRING) {
qCWarning(lcPlugin) << "Plugin has wrong version" << pluginPath << metadata["version"];
qCWarning(lcPlugin) << "Plugin has wrong version" << loader.fileName() << metadata["version"];
return false;
}

4
src/gui/application.cpp
View file

@ -281,7 +281,9 @@ Application::Application(int &argc, char **argv)
if (QDir::isRelativePath(extraPluginPath))
extraPluginPath = QDir(QApplication::applicationDirPath()).filePath(extraPluginPath);
qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginPath;
addLibraryPath(extraPluginPath);
QStringList pluginPath = libraryPaths();
pluginPath.prepend(extraPluginPath);
setLibraryPaths(pluginPath);
}
#endif