From: Hannah von Reth <hannah.vonreth@owncloud.com>
Date: Wed, 4 Dec 2019 12:21:17 +0000 (+0100)
Subject: Prepend PLUGINDIR else its pointless
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~148
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3317e354f257cd63caa0e551d11dc2aa8c779f4f;p=nextcloud-desktop.git

Prepend PLUGINDIR else its pointless
---

diff --git a/src/common/vfs.cpp b/src/common/vfs.cpp
index efec96639..69c377170 100644
--- a/src/common/vfs.cpp
+++ b/src/common/vfs.cpp
@@ -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;
     }
 
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 094899cda..df70eb924 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -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