[Pkg-owncloud-commits] [owncloud-client] 408/470: Workaround ubuntu 16.04 systemtray bug (#4693) (#4747)

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 0da2adcbe02eb9499e90622ca60a726ba75d0188
Author: Olivier Goffart <olivier at woboq.com>
Date:   Wed Apr 27 11:21:13 2016 +0200

    Workaround ubuntu 16.04 systemtray bug (#4693) (#4747)
---
 src/gui/main.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index ff5434a..1a13d1f 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -127,8 +127,17 @@ int main(int argc, char **argv)
             return -1;
         }
         return 0;
-    } else {
+    }
+#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+    if (qgetenv("QT_QPA_PLATFORMTHEME") != "appmenu-qt5")
+        // We can't call isSystemTrayAvailable with appmenu-qt5 begause it hides the systemtray
+        // (issue #4693)
+#endif
+    {
         if (!QSystemTrayIcon::isSystemTrayAvailable()) {
+            // If the systemtray is not there, we will wait one second for it to maybe start
+            // (eg boot time) then we show the settings dialog if there is still no systemtray.
+            // On XFCE however, we show a message box with explainaition how to install a systemtray.
             Utility::sleep(1);
             auto desktopSession = qgetenv("XDG_CURRENT_DESKTOP").toLower();
             if (desktopSession.isEmpty()) {
@@ -152,6 +161,7 @@ int main(int argc, char **argv)
             }
         }
     }
+
     return app.exec();
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git