[Pkg-owncloud-commits] [owncloud-client] 09/218: Tray: Hide while modifying menus #3656 #3672

[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 ed28a21cb0c3c0cf6f76c6a18efd33d14bab4098
Author: Christian Kamm <mail at ckamm.de>
Date:   Tue Aug 25 09:46:03 2015 +0200

    Tray: Hide while modifying menus #3656 #3672
    
    This may help workaround the dbus tray issue in Qt 5.5.0.
---
 src/gui/owncloudgui.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index a66b66a..4df744d 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -368,6 +368,12 @@ void ownCloudGui::setupContextMenu()
         }
     }
 
+    // Workaround for #3656, Qt 5.5.0 + dbus based tray integration.
+#ifdef Q_OS_LINUX
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+    _tray->hide();
+#endif
+#endif
 
     if ( _contextMenu ) {
         _contextMenu->clear();
@@ -435,7 +441,6 @@ void ownCloudGui::setupContextMenu()
     // Workaround for #3656, Qt 5.5.0 + dbus based tray integration.
 #ifdef Q_OS_LINUX
 #if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
-    _tray->hide();
     _tray->show();
 #endif
 #endif

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