diff options
author | dknn <yoann.blein@free.fr> | 2012-08-17 15:32:43 (GMT) |
---|---|---|
committer | dknn <yoann.blein@free.fr> | 2012-09-22 09:34:49 (GMT) |
commit | 6247ed394302ff2cf1f33a71df808bebf7241242 (patch) | |
tree | d4d61fb5e66611ecdc75cf1149b64e23fef2b077 /Swift/Controllers/ScreenSharing/ScreenSharingController.cpp | |
parent | c8ced8597ab28b928862d21554c0a68c238b1165 (diff) | |
download | swift-contrib-6247ed394302ff2cf1f33a71df808bebf7241242.zip swift-contrib-6247ed394302ff2cf1f33a71df808bebf7241242.tar.bz2 |
Fix test suite compliance
Diffstat (limited to 'Swift/Controllers/ScreenSharing/ScreenSharingController.cpp')
-rw-r--r-- | Swift/Controllers/ScreenSharing/ScreenSharingController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/ScreenSharing/ScreenSharingController.cpp b/Swift/Controllers/ScreenSharing/ScreenSharingController.cpp index 2e9a75d..a42e9bb 100644 --- a/Swift/Controllers/ScreenSharing/ScreenSharingController.cpp +++ b/Swift/Controllers/ScreenSharing/ScreenSharingController.cpp @@ -23,7 +23,7 @@ namespace Swift { ScreenSharingController::ScreenSharingController(ScreenSharingManager* screenSharingManager, TimerFactory* timerFactory, DesktopScreenGrabber* desktopScreenGrabber, const JID& to) - : screenGrabber(desktopScreenGrabber), grabTimer(timerFactory->createTimer(500)), remoteScreenWindowFactory(0), + : screenGrabber(desktopScreenGrabber), grabTimer(timerFactory->createTimer(1000/0.5)), remoteScreenWindowFactory(0), remoteScreenWindow(0), otherParty(to), incoming(false), chatWindow(0) { OutgoingScreenSharing::ref oss = screenSharingManager->createOutgoingScreenSharing(to); @@ -108,7 +108,7 @@ void ScreenSharingController::handleReady() void ScreenSharingController::handleFinished() { - screenSharing->onFinished.disconnect(boost::bind(&ScreenSharingController::handleFinished, this)); +// screenSharing->onFinished.disconnect(boost::bind(&ScreenSharingController::handleFinished, this)); screenSharing.reset(); delete remoteScreenWindow; remoteScreenWindow = 0; |