From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Wed, 20 Jan 2021 14:16:13 +0000 (+0100)
Subject: Revert "Make monochrome icons the default on Linux and Mac OS."
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~412^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=96b2b2a50995f85c1d4740ffd520e0963f0a0c54;p=nextcloud-desktop.git

Revert "Make monochrome icons the default on Linux and Mac OS."

This reverts commit 016410dbaad9cfa85209d6424dc2df9362a80a17.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index be877e712..bc4ab69b4 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -896,10 +896,10 @@ void ConfigFile::setPromptDeleteFiles(bool promptDeleteFiles)
 bool ConfigFile::monoIcons() const
 {
     QSettings settings(configFile(), QSettings::IniFormat);
-    // On Mac and Linux we want bw by default
-    bool monoDefault = QByteArrayLiteral("Nextcloud") == QByteArrayLiteral(APPLICATION_NAME);
-#ifdef Q_OS_WIN
-    monoDefault = false;
+    bool monoDefault = false; // On Mac we want bw by default
+#ifdef Q_OS_MAC
+    // OEM themes are not obliged to ship mono icons
+    monoDefault = (0 == (strcmp("ownCloud", APPLICATION_NAME)));
 #endif
     return settings.value(QLatin1String(monoIconsC), monoDefault).toBool();
 }