[Pkg-owncloud-commits] [owncloud-client] 13/38: wizard: don't call initializePage

[Sandro Knauß]

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

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

commit cfdfd6a8601445f2eb29a392c1be65c4e1122c4b
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jul 30 12:18:55 2014 +0200

    wizard: don't call initializePage
    
    It is called automatically by QWizard and do not need to be called explicitly
    
    But setVisibla(false) don't really have an effect there since show() is going
    to be called on the page
---
 src/wizard/owncloudsetuppage.cpp | 6 +++++-
 src/wizard/owncloudwizard.cpp    | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/wizard/owncloudsetuppage.cpp b/src/wizard/owncloudsetuppage.cpp
index 06cfbe6..e84d6dd 100644
--- a/src/wizard/owncloudsetuppage.cpp
+++ b/src/wizard/owncloudsetuppage.cpp
@@ -16,6 +16,7 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QUrl>
+#include <QTimer>
 #include <QPushButton>
 #include <QMessageBox>
 
@@ -145,9 +146,12 @@ void OwncloudSetupPage::initializePage()
     if (Theme::instance()->overrideServerUrl().isEmpty()) {
         _ui.leUrl->setFocus();
     } else {
-        setVisible(false);
         setCommitPage(true);
         validatePage();
+        setVisible(false);
+        // because the wizard will call show on us right after this call, we need to hide in the
+        // next event loop iteration.
+        QTimer::singleShot(0, this, SLOT(hide()));
     }
 }
 
diff --git a/src/wizard/owncloudwizard.cpp b/src/wizard/owncloudwizard.cpp
index 94e3559..4ee870d 100644
--- a/src/wizard/owncloudwizard.cpp
+++ b/src/wizard/owncloudwizard.cpp
@@ -161,7 +161,6 @@ void OwncloudWizard::slotCurrentPageChanged( int id )
 
     if( id == WizardCommon::Page_ServerSetup ) {
         emit clearPendingRequests();
-        _setupPage->initializePage();
     }
 
     if( id == WizardCommon::Page_Result ) {

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