Workaround for Ubuntu 16.04 tray issue #4944 (#4947)

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 727d3bdc9607a01bf5d2af44878ba0d17dc141c4..151f7b876d7d7ee9758b094ce2e2fdec1b3a94f9 100644 (file)
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -159,7 +159,13 @@ void AccountSettings::createAccountToolbox()
 
 void AccountSettings::slotOpenAccountWizard()
 {
-    if (QSystemTrayIcon::isSystemTrayAvailable()) {
+    if (
+#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+            qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5"
+                // We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray
+                // (issue #4693, #4944)
+#endif
+            || QSystemTrayIcon::isSystemTrayAvailable()) {
         topLevelWidget()->close();
     }
 #ifdef Q_OS_MAC

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index d4d41c56c189f898a67b15ec7a86979b60765dff..6373da4c44c9c2ef00795b91aa2d2487e2b6063d 100644 (file)
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -161,12 +161,4 @@ void GeneralSettings::slotIgnoreFilesEditor()
     }
 }
 
-void GeneralSettings::slotOpenAccountWizard()
-{
-    if (QSystemTrayIcon::isSystemTrayAvailable()) {
-        topLevelWidget()->close();
-    }
-    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), 0);
-}
-
 } // namespace OCC

diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h
index 74c297f301e784982ada595eb375e9f34a9b8d28..69c96c4a1994a075e1fde343937535a4446651c2 100644 (file)
--- a/src/gui/generalsettings.h
+++ b/src/gui/generalsettings.h
@@ -44,7 +44,6 @@ private slots:
     void slotToggleOptionalDesktopNotifications(bool);
     void slotUpdateInfo();
     void slotIgnoreFilesEditor();
-    void slotOpenAccountWizard();
 
 private:
     void loadMiscSettings();