This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository telekinesis. from 3be7ddd follow-up for last commit: add forgotten directory new f9ce2cb drop sub: mediaFileINFO. Not needed in TeKi anymore new 9af0419 Supporting_Services.pm: Fix typo in code that detects _NET_ACTIVE_WINDOW. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: X2Go/Telekinesis/Apps/AppCore.pm | 35 +----------------------- X2Go/Telekinesis/Client/Supporting_Services.pm | 2 +- 2 files changed, 2 insertions(+), 35 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository telekinesis. commit f9ce2cbf97c34fd8aebdc508bce25362d76adff4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 21 23:11:27 2014 +0200 drop sub: mediaFileINFO. Not needed in TeKi anymore --- X2Go/Telekinesis/Apps/AppCore.pm | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/X2Go/Telekinesis/Apps/AppCore.pm b/X2Go/Telekinesis/Apps/AppCore.pm index d0b6a35..69b9594 100644 --- a/X2Go/Telekinesis/Apps/AppCore.pm +++ b/X2Go/Telekinesis/Apps/AppCore.pm @@ -25,7 +25,7 @@ package X2Go::Telekinesis::Apps::AppCore; use strict; use Glib qw/TRUE FALSE/; use Exporter qw(import); -our @EXPORT_OK = qw(getTeKiPaths tkappDie appDBugLog cleanUpOldAppSession checkAppSesLOCKnDirs mediaFileINFO initLOCKandDirs getXWinPosNDim showAboutPOP getBasicServersideInfo getCmdFlags getBasicClientsideInfo epicFailPOP); +our @EXPORT_OK = qw(getTeKiPaths tkappDie appDBugLog cleanUpOldAppSession checkAppSesLOCKnDirs initLOCKandDirs getXWinPosNDim showAboutPOP getBasicServersideInfo getCmdFlags getBasicClientsideInfo epicFailPOP); use X2Go::Telekinesis::CommonCore qw(tcDie sanitizer genRandFID checkPID sanitizeFilePath sanitizeDirPath genRandSID clups dbugPrint); use File::Path qw(make_path remove_tree); @@ -230,39 +230,6 @@ sub getBasicClientsideInfo { return ($UserName,$UserHome,$X2GoSID,$X2GoSesHome,$X2GoTKCHome,$TeKiLSockPath); } -sub mediaFileINFO { # Initially we we're using another perl module for this but it turned out to have some (b) ithchy dependencies on some never distros so fk that... - # "Self made" is not always well made.... but it takes less to rigg this short sub rather than debugging 3rd party crud. - # Plan to expand on the content of the returned %FileInfo but at the moment this is all we need for preliminary validation that the file is actually a playable file. - my $FilePath = sanitizeFilePath($_[0]); - my %FileInfo; - if (-f $FilePath) { - open(MPINFO,"-|","/usr/bin/mplayer",'-vo','null','-ao','null', '-identify','-frames','0','-nolirc',$FilePath); - my @MPInfo = <MPINFO>; - close(MPINFO); - foreach my $line (@MPInfo) { - $line =~ s/\n//g; - if ($line =~ /^ID\_LENGTH\=([\d\.]*)$/) { - $FileInfo{'length'} = $1; - } elsif ($line =~ /^ID\_VIDEO\_CODEC\=(.*)$/) { - $FileInfo{'vcodec'} = $1; - } elsif ($line =~ /^ID\_AUDIO\_CODEC\=(.*)$/) { - $FileInfo{'acodec'} = $1; - } - } - if ($FileInfo{'length'} > 0) { - if ($FileInfo{'vcodec'}) { - return (1,"V",%FileInfo); - } else { - if ($FileInfo{'acodec'}) { - return (1,"A",%FileInfo); - } else {return 0;} - } - } else {return 0;} - } else { - return 0; - } -} - sub showAboutPOP { my $dialog = Gtk2::Dialog->new ("About $::APPDNAME v$::APPVER", undef, [qw/modal destroy-with-parent/], 'gtk-ok' => 'ok', -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository telekinesis. commit 9af04197da40e10b526e62ed600696916dba834d Author: GZNG Tech <tech@gznianguan.com> Date: Sun Jun 22 14:44:56 2014 +0200 Supporting_Services.pm: Fix typo in code that detects _NET_ACTIVE_WINDOW. --- X2Go/Telekinesis/Client/Supporting_Services.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X2Go/Telekinesis/Client/Supporting_Services.pm b/X2Go/Telekinesis/Client/Supporting_Services.pm index 90bffa2..a9a511c 100644 --- a/X2Go/Telekinesis/Client/Supporting_Services.pm +++ b/X2Go/Telekinesis/Client/Supporting_Services.pm @@ -58,7 +58,7 @@ sub getActiveWindowAndDTSIZE { while (<RUN>) { my $line = $_; $line =~ s/[\n\ ]//g; - if ($line =~ /^_NET_ACTIVE_WINDOW\(WINDOW\):windowid#([a-z\d]{9})\,/) { + if ($line =~ /^_NET_ACTIVE_WINDOW\(WINDOW\):windowid#([a-z\d]{9})/) { $return = $1; } elsif ($line =~ /^_NET_DESKTOP_GEOMETRY\(CARDINAL\)\=([\d]{1,5})\,([\d]{1,5})$/) { $returnX = $1; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
-
git-admin＠x2go.org