This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch gzng in repository mteleplayer. commit b4e9dfe55d5272cae3062acc8e2337ea6b20149e Author: gznget <opensource@gznianguan.com> Date: Wed Sep 10 11:22:45 2014 +0200 Make client mTP wait for X2Go window before starting --- .../mteleplayer/bin/mteleplayer_clientside | 35 +++++++++++--------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside index 9c99fe4..8798a1d 100755 --- a/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside +++ b/clientside/lib/telekinesis/client/applications/mteleplayer/bin/mteleplayer_clientside @@ -176,21 +176,26 @@ $window->show_all(); my $X2GoCliWin; my $X2GoCliWinID; my $mTPWin; - if (-f "$X2GoSesHome/session.window") { - open(SWXID,"$X2GoSesHome/session.window"); - my ($tmpSwXid,undef) = <SWXID>; - close(SWXID); - if ($tmpSwXid =~ /ID:(\d*)/) { - dbugPrint("session.window file OK ($1)"); - my $gdkwin = $window->window; - my $ourXid= $gdkwin->XWINDOW; - $mTPWin = Gtk2::Gdk::Window->foreign_new($ourXid); - $X2GoCliWin = Gtk2::Gdk::Window->foreign_new($1); - $X2GoCliWinID = $1; - $mTPWin->reparent($X2GoCliWin,0,0); - $mTPWin->set_accept_focus(0); - } - } + +while ($X2GoCliWinID < 1) { + if (-f "$X2GoSesHome/session.window") { + open(SWXID,"$X2GoSesHome/session.window"); + my ($tmpSwXid,undef) = <SWXID>; + close(SWXID); + if ($tmpSwXid =~ /ID:(\d*)/) { + dbugPrint("session.window file OK ($1)"); + my $gdkwin = $window->window; + my $ourXid= $gdkwin->XWINDOW; + $mTPWin = Gtk2::Gdk::Window->foreign_new($ourXid); + $X2GoCliWin = Gtk2::Gdk::Window->foreign_new($1); + $X2GoCliWinID = $1; + $mTPWin->reparent($X2GoCliWin,0,0); + $mTPWin->set_accept_focus(0); + } + } else { + usleep(10000); + } +} &do_mplayer; doOverlayMagic('init'); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/mteleplayer.git