From e9b4cb4721b7c7f02728e22f92f5ad7a94828521 Mon Sep 17 00:00:00 2001 From: sr Date: Tue, 5 Feb 2013 19:48:39 +0100 Subject: [SERVER] Go back from ClientId to int, so queued signal/slot connections work --- src/server/mainwindow/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/mainwindow/mainwindow.cpp') diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index ceb445a..12c7921 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -634,7 +634,7 @@ void MainWindow::onClientAuthenticated(Client* client) { disconnect(client, SIGNAL(authenticated(Client*)), this, SLOT(onClientAuthenticated(Client*))); connect(client, SIGNAL(vncServerStateChange(Client*)), this, SLOT(onVncServerStateChange(Client*)), Qt::QueuedConnection); - connect(client, SIGNAL(vncClientStateChange(Client*, ClientId)), this, SLOT(onVncClientStateChange(Client*, ClientId)), Qt::QueuedConnection); + connect(client, SIGNAL(vncClientStateChange(Client*, int)), this, SLOT(onVncClientStateChange(Client*, int)), Qt::QueuedConnection); bool hasActiveTutor = false; ConnectionFrame *deadTutor = NULL; bool anyClient = false; @@ -778,7 +778,7 @@ void MainWindow::onVncServerStateChange(Client* client) } } -void MainWindow::onVncClientStateChange(Client* client, ClientId lastProjectionSource) +void MainWindow::onVncClientStateChange(Client* client, int lastProjectionSource) { if (!isValidClient(client)) // Check here because this slot is connected queued return; -- cgit v1.2.3-55-g7522