This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository mteleplayer. commit 747f5a7d522d74643ed30587d2d80a39e4979107 Author: gznget <opensource@gznianguan.com> Date: Fri Aug 29 06:25:58 2014 +0200 Relaxing some timeout limits to prevent premature selfdestruction on slow connections --- .../mteleplayer/bin/mteleplayer_clientside | 2 +- serverside/bin/mteleplayer | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside index c9580bd..945030c 100755 --- a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside +++ b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside @@ -166,7 +166,7 @@ $window->show_all(); &do_mplayer; doOverlayMagic('init'); -$TnW{'timeoutRound'} = Glib::Timeout->add (1000, sub {appCOM("YO!");if ($sstatusi{'lastCOMtime'} < (time()-4)) {&doSelfTerminate;}1;}); +$TnW{'timeoutRound'} = Glib::Timeout->add (1000, sub {appCOM("YO!");if ($sstatusi{'lastCOMtime'} < (time()-8)) {&doSelfTerminate;}1;}); $TnW{'transglitcpresistance'} = Glib::Timeout->add(100, \&connectionPresistance); $TnW{'mouseDeDodger'} = Glib::Timeout->add(100, sub {if ($olMagic{'dodgeMouse'} eq 1) {doOverlayMagic('dodgemouse',0);}1;}); diff --git a/serverside/bin/mteleplayer b/serverside/bin/mteleplayer index 8b9aed2..4b9b2db 100755 --- a/serverside/bin/mteleplayer +++ b/serverside/bin/mteleplayer @@ -158,7 +158,7 @@ $TnW{'runstatechanges'} = Glib::Timeout->add (100, \&coreRunSTATEchanges); #my $randomcrap = Glib::Timeout->add (250, sub {if(($sstatusi{'runState'} eq "R") and ($sstatusi{'sockState'} > 0) and ($sstatusi{'X2GoResized'} > 0)){ # $sstatusi{'X2GoResized'}--; checkDimPosNSend(1);} 1;}); my $randomcrap = Glib::Timeout->add (150, sub {if(($sstatusi{'runState'} eq "R") and ($sstatusi{'sockState'} > 0)) { - if ($sstatusi{'lastCOMtime'} < (time()-2)) {toggleBLACKOUT(1);} else { + if ($sstatusi{'lastCOMtime'} < (time()-10)) {toggleBLACKOUT(1);} else { checkDimPosNSend(); } } 1;}); @@ -599,7 +599,6 @@ print "$remoteDir/$PlayerStatus{'currentMediaID'}.jpg\n"; $fh->close; $fh = undef; $sstatusi{'sockState'} = 0; - Gtk2->main_iteration while Gtk2->events_pending; return 0; } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git