From 608c1434cf8dcead3f132cf0b4bd6a3c79cf70d4 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Wed, 15 Sep 2021 12:09:48 +0200
Subject: [PATCH] Fix build with libcloudproviders, reported in #8996

---
 config.h.in                                     |  1 +
 src/gui/libcloudproviders/libcloudproviders.cpp | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config.h.in b/config.h.in
index b5fd21df6de..fed3df46687 100644
--- a/config.h.in
+++ b/config.h.in
@@ -22,6 +22,7 @@
 #define APPLICATION_DOTVIRTUALFILE_SUFFIX "." APPLICATION_VIRTUALFILE_SUFFIX
 #cmakedefine APPLICATION_CLOUDPROVIDERS_DBUS_NAME "@APPLICATION_CLOUDPROVIDERS_DBUS_NAME@"
 #cmakedefine APPLICATION_CLOUDPROVIDERS_DBUS_PATH "@APPLICATION_CLOUDPROVIDERS_DBUS_PATH@"
+#cmakedefine WITH_LIBCLOUDPROVIDERS "@WITH_LIBCLOUDPROVIDERS@"
 
 #cmakedefine ZLIB_FOUND @ZLIB_FOUND@
 
diff --git a/src/gui/libcloudproviders/libcloudproviders.cpp b/src/gui/libcloudproviders/libcloudproviders.cpp
index 3f8f81c7215..0d12a492f61 100644
--- a/src/gui/libcloudproviders/libcloudproviders.cpp
+++ b/src/gui/libcloudproviders/libcloudproviders.cpp
@@ -12,12 +12,10 @@
  * for more details.
  */
 
-extern "C" {
-    #include <cloudproviders/cloudprovidersaccountexporter.h>
-    #include <cloudproviders/cloudprovidersproviderexporter.h>
-    #include <gio/gio.h>
-    #include <glib.h>
-}
+#include <cloudproviders/cloudprovidersaccountexporter.h>
+#include <cloudproviders/cloudprovidersproviderexporter.h>
+#include <gio/gio.h>
+#include <glib.h>
 
 #include "libcloudproviders.h"
 #include "libcloudproviders_p.h"
@@ -84,7 +82,7 @@ void LibCloudProvidersPrivate::start()
 
 void LibCloudProvidersPrivate::updateExportedFolderList()
 {
-    const auto newFolders = FolderMan::instance()->list();
+    const auto newFolders = FolderMan::instance()->map().values();
     const auto oldFolders = _folderExports.keys();
 
     // Remove folders that are no longer exported