[X2Go-Commits] [x2goclient] 01/01: onmainwindow.cpp: actually call slotTunnelOk(int), do not generate a run time error by calling the non-existent function slotTunnelOk().

git-admin at x2go.org git-admin at x2go.org
Sat Mar 7 02:10:28 CET 2015


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

x2go pushed a commit to branch bugfix/general
in repository x2goclient.

commit 982268a2797871c8a3b8c439ec2c4bca50641db5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Mar 7 02:09:39 2015 +0100

    onmainwindow.cpp: actually call slotTunnelOk(int), do not generate a run time error by calling the non-existent function slotTunnelOk().
    
    Fixes #804.
---
 debian/changelog     |    3 +++
 src/onmainwindow.cpp |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1d4fb5b..4d9ae61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -181,6 +181,9 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - Windows: correctly reference windows icon.
     - x2goclient.spec: fix builds on Fedora and related due to failing removal
       of browserplugin directory. That's non-critical.
+    - onmainwindow.cpp: actually call slotTunnelOk(int), do not generate a run
+      time error by calling the non-existent function slotTunnelOk(). Fixes
+      #804.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 19 Feb 2015 13:25:28 +0100
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 3e41db8..45ef1f8 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5175,7 +5175,7 @@ void ONMainWindow::slotTunnelOk(int)
 
         x2goDebug<<"Waiting for win-servers.";
 
-        QTimer::singleShot ( 100, this, SLOT ( slotTunnelOk() ) );
+        QTimer::singleShot ( 100, this, SLOT ( slotTunnelOk(int) ) );
         return;
     }
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list