[Pkg-owncloud-commits] [owncloud-client] 40/83: Make sure the settings window is brought up when minimized

[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 a60902b33d78d4c951f90e01b004bbdc3e7e6eff
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon May 26 14:31:10 2014 +0200

    Make sure the settings window is brought up when minimized
    
    Fixes #1804
---
 src/mirall/utility.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mirall/utility.cpp b/src/mirall/utility.cpp
index 1b7b3ee..696d148 100644
--- a/src/mirall/utility.cpp
+++ b/src/mirall/utility.cpp
@@ -168,10 +168,10 @@ void Utility::raiseDialog( QWidget *raiseWidget )
 {
 #ifndef TOKEN_AUTH_ONLY
     if( raiseWidget && raiseWidget->parentWidget() == 0) {
-        raiseWidget->hide();
         // Qt has a bug which causes parent-less dialogs to pop-under.
-        raiseWidget->setWindowFlags(raiseWidget->windowFlags() & ~Qt::Dialog);
         raiseWidget->showNormal();
+        raiseWidget->raise();
+        raiseWidget->activateWindow();
     }
 #endif
 }

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