x2go-commits March 2012

x2go-commits@lists.x2go.org

1 participants
192 discussions

x2goserver.git - master (branch) updated: 3.1.0.1-6-ge3dab38
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via e3dab38f75692668c0a276eab3c09a94655ee320 (commit) from 15a647adc8f64e964fd01a18369c2b5783c53157 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e3dab38f75692668c0a276eab3c09a94655ee320 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Thu Mar 8 13:25:11 2012 +0100 Support for "published applications". ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++- x2goserver/bin/x2gogetapps | 192 +++++++++++++++++++++++++++++++++++++++++ x2goserver/bin/x2goruncommand | 7 ++ x2goserver/bin/x2gostartagent | 6 +- 4 files changed, 212 insertions(+), 3 deletions(-) create mode 100755 x2goserver/bin/x2gogetapps The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fbf1141..f4050ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ -x2goserver (3.1.0.2-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.0.2-0~x2go1.1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (3.1.0.2): - Syslog warnings have to be named ,,warning'' not ,,warn''. - Add usage output to x2goserver-run-extensions. - Fix syslog output of x2goserver-run-exentions. - Fix x2goserver extension calls in x2goruncommand. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:08:33 +0100 + [ Oleksandr Shneyder ] + * New upstream version (3.1.0.2): + - support for "published applications". + Sponsored by Stefan Baur <postmaster(a)stefanbaur.de> + + -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Thu, 08 Mar 2012 13:24:10 +0100 x2goserver (3.1.0.1-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps new file mode 100755 index 0000000..f95a1ee --- /dev/null +++ b/x2goserver/bin/x2gogetapps @@ -0,0 +1,192 @@ +#!/usr/bin/perl + +# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +use strict; +use Sys::Syslog qw( :standard :macros ); +use MIME::Base64 qw(encode_base64); + +use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use x2gologlevel; + +my @iconext=("png","svg","jpeg","jpg","xpm","bmp"); + +my @icondirs=( +"/usr/share/icons/hicolor/22x22/apps", +"/usr/share/icons/hicolor/24x24/apps", +"/usr/share/icons/hicolor/32x32/apps", +"/usr/share/icons/hicolor/36x36/apps", +"/usr/share/icons/hicolor/48x48/apps", +"/usr/share/icons/hicolor/64x64/apps", +"/usr/share/icons/hicolor/72x72/apps", +"/usr/share/icons/hicolor/96x96/apps", +"/usr/share/icons/hicolor/128x128/apps", +"/usr/share/icons/hicolor/256x256/apps", +"/usr/share/icons/hicolor/scalable/apps", +"/usr/share/pixmaps", +"/usr/share/icons/default.kde/22x22/apps", +"/usr/share/icons/default.kde/24x24/apps", +"/usr/share/icons/default.kde/32x32/apps", +"/usr/share/icons/default.kde/36x36/apps", +"/usr/share/icons/default.kde/48x48/apps", +"/usr/share/icons/default.kde/64x64/apps", +"/usr/share/icons/default.kde/72x72/apps", +"/usr/share/icons/default.kde/96x96/apps", +"/usr/share/icons/default.kde/128x128/apps", +"/usr/share/icons/default.kde/256x256/apps", +"/usr/share/icons/default.kde4/22x22/apps", +"/usr/share/icons/default.kde4/24x24/apps", +"/usr/share/icons/default.kde4/32x32/apps", +"/usr/share/icons/default.kde4/36x36/apps", +"/usr/share/icons/default.kde4/48x48/apps", +"/usr/share/icons/default.kde4/64x64/apps", +"/usr/share/icons/default.kde4/72x72/apps", +"/usr/share/icons/default.kde4/96x96/apps", +"/usr/share/icons/default.kde4/128x128/apps", +"/usr/share/icons/default.kde4/256x256/apps" +); + +sub findicon +{ + my $file=shift; + foreach(@iconext) + { + my $icon=findicon_ext("$file.$_"); + if( $icon ne "" ) + { + return "$icon"; + } + } + return ""; +} + +sub findicon_ext +{ + my $file=shift; + foreach(@icondirs) + { + if( -e "$_/$file" ) + { + return "$_/$file"; + } + } + return ""; +} + +sub printicon +{ + my $file=shift; + if (open(I,"<$file")) + { + my $buf; + print "<icon>\n"; + while (read(I, $buf, 60*57)) + { + print encode_base64($buf); + } + print "</icon>\n"; + close(I); + } + else + { + syslog ('info', "x2gogetapps:printicon - can't open file $file: $!"); + } +} + +sub proc_desktop_file +{ + my $file=shift; + if (open(F,"<$file")) + { + print("<desktop>\n"); + while(!eof(F)) + { + my $line=<F>; + if( $line=~m/^Categories/i || $line=~m/^Name/i || $line=~m/^Comment/i || $line=~m/^Exec/i) + { + print $line; + } + if( $line =~ m/^Icon/ ) + { + my $icon=$line; + $icon =~ s/Icon=//; + chop($icon); + #$line is absolute path + if($icon =~ m/\//) + { + $icon=$icon; + } + #$line have format ext. + elsif ($line =~ m/\./) + { + $icon=findicon_ext($icon); + } + else + { + $icon=findicon($icon); + } + printicon($icon); + } + } + close (F); + print("</desktop>\n"); + } + else + { + syslog ('info', "x2gogetapps:proc_desktop_file - can't open file $file: $!"); + } +} + +openlog($0,'cons,pid','user'); +setlogmask( LOG_UPTO(x2gologlevel()) ); + +if ( @ARGV ) { + syslog('info', "x2gogetapps has been called with options: @ARGV"); +} else { + syslog('info', "x2gogetapps has been called without options"); +} + +my $file; +my @dirs; +@dirs[0]="/etc/x2go/applications"; +my ($name, $pass, $uid, $gid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam(getlogin || getpwuid($<)); +@dirs[1]="$homedir/.x2go/applications"; +foreach(@dirs) +{ + my $dirname=$_; + if( opendir(DIR, $dirname)) + { + while (defined($file = readdir(DIR))) + { + if($file =~ m/.desktop/) + { + proc_desktop_file("$dirname/$file"); + } + } + closedir(DIR); + } + else + { + syslog ('info', "x2gogetapps - can't opendir $dirname: $!"); + } +} +# closing syslog +closelog; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index c73cb6a..2f70633 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -122,6 +122,13 @@ then IMEXIT="true" fi +if [ "$X2GO_SESS_TYPE" == "P" ] +then + IMEXIT="false" + EXEC="/bin/true" + X2GO_SESS_TYPE="R" +fi + # run x2goserver-extensions for pre-runcommand x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" pre-runcommand || true diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 679852e..739a0c2 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -105,9 +105,13 @@ export NX_CLIENT="$X2GO_LIB_PATH/x2gosuspend-agent" COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'` SESSION_TYPE="D" +NOEXITPARAM="" if [ "$X2GO_STYPE" == "R" ]; then SESSION_TYPE="R" +elif [ "$X2GO_STYPE" == "P" ]; then + SESSION_TYPE="R" + NOEXITPARAM="-norootlessexit" elif [ "$X2GO_STYPE" == "S" ]; then SESSION_TYPE="S" fi @@ -244,7 +248,7 @@ SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & else - x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & fi hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.6-5-g31124b8
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via 31124b868c8d293a65000ba66f475dedff9d7473 (commit) from 8d5416361412b413f4b1fd0e3b49dba92ad6fe27 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 31124b868c8d293a65000ba66f475dedff9d7473 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 13:11:42 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index cd263f0..ff27689 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.6 +1.0.1.7 diff --git a/debian/changelog b/debian/changelog index 592a2b0..5d29077 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gothinclient (1.0.1.7-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 08 Mar 2012 13:11:29 +0100 + x2gothinclient (1.0.1.6-0~x2go2) unstable; urgency=low * Fix dependency on x2goclient. hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.6-4-g8d54163
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via 8d5416361412b413f4b1fd0e3b49dba92ad6fe27 (commit) from 88970349eba8e1e1c585867ef7a30a8fb75d1d83 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a895e20..592a2b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -x2gothinclient (1.0.1.6-0~x2go2) UNRELEASED; urgency=low +x2gothinclient (1.0.1.6-0~x2go2) unstable; urgency=low * Fix dependency on x2goclient. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 08 Mar 2012 13:08:52 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 08 Mar 2012 13:10:14 +0100 x2gothinclient (1.0.1.6-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - build-main (branch) updated: 1.0.1.6-4-g8d54163
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, build-main has been updated via 8d5416361412b413f4b1fd0e3b49dba92ad6fe27 (commit) from 88970349eba8e1e1c585867ef7a30a8fb75d1d83 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8d5416361412b413f4b1fd0e3b49dba92ad6fe27 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 13:10:45 2012 +0100 package fix release 1.0.1.6-0~x2go2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a895e20..592a2b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -x2gothinclient (1.0.1.6-0~x2go2) UNRELEASED; urgency=low +x2gothinclient (1.0.1.6-0~x2go2) unstable; urgency=low * Fix dependency on x2goclient. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 08 Mar 2012 13:08:52 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 08 Mar 2012 13:10:14 +0100 x2gothinclient (1.0.1.6-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - build-main (branch) updated: 1.0.1.6-3-g8897034
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, build-main has been updated via 88970349eba8e1e1c585867ef7a30a8fb75d1d83 (commit) via 5ad31230d970b28668a7f5a337e97acb3fb37727 (commit) via f648f7d1f7be346145c629e137c280a00e09f456 (commit) from d64d625129a79804040ea6fe6059675135034ee3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2ca6b3c..a895e20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gothinclient (1.0.1.6-0~x2go2) UNRELEASED; urgency=low + + * Fix dependency on x2goclient. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 08 Mar 2012 13:08:52 +0100 + x2gothinclient (1.0.1.6-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/control b/debian/control index f3b9c59..21bf456 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Architecture: all Depends: ${misc:Depends}, psmisc, - x2goclient (>= 3.99.1.1), + x2goclient (>= 3.99.1.1-0~), xauth, xinit, locales hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.6-3-g8897034
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via 88970349eba8e1e1c585867ef7a30a8fb75d1d83 (commit) via 5ad31230d970b28668a7f5a337e97acb3fb37727 (commit) from f648f7d1f7be346145c629e137c280a00e09f456 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 88970349eba8e1e1c585867ef7a30a8fb75d1d83 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 13:09:05 2012 +0100 Fix dependency on x2goclient. commit 5ad31230d970b28668a7f5a337e97acb3fb37727 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 13:08:12 2012 +0100 Revert "Continue development..." This reverts commit f648f7d1f7be346145c629e137c280a00e09f456. ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 +++--- debian/control | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index ff27689..cd263f0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.7 +1.0.1.6 diff --git a/debian/changelog b/debian/changelog index b0d1705..a895e20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -x2gothinclient (1.0.1.7-0~x2go1) UNRELEASED; urgency=low +x2gothinclient (1.0.1.6-0~x2go2) UNRELEASED; urgency=low - * Continue development... + * Fix dependency on x2goclient. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:04:26 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 08 Mar 2012 13:08:52 +0100 x2gothinclient (1.0.1.6-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index f3b9c59..21bf456 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Architecture: all Depends: ${misc:Depends}, psmisc, - x2goclient (>= 3.99.1.1), + x2goclient (>= 3.99.1.1-0~), xauth, xinit, locales hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.4-4-gba01ce7
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via ba01ce756648010e0bd518067c94654e55693e24 (commit) via 94db97f8857d766f41f511b43726cb88439120e6 (commit) from 0bb58902760aec107e45c8b7981ac14e07d7715f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ba01ce756648010e0bd518067c94654e55693e24 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 12:12:49 2012 +0100 re-arrange package names in control file commit 94db97f8857d766f41f511b43726cb88439120e6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 12:12:08 2012 +0100 Depend on x2goserver (>=3.1.0.2). Earlier versions have a bug in x2goruncommand that let's execution of X2Go server extensions fail. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6111a3b..76c91ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ x2gognomebindings (2.0.1.5-0~x2go1) UNRELEASED; urgency=low * New upstream version (2.0.1.5): - Let GNOME sessions started via X2Go ignore GNOME's monitor settings in ~/.config/monitors.xml. + * Depend on x2goserver (>=3.1.0.2). Earlier versions have a bug in + x2goruncommand that let's execution of X2Go server extensions fail. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:41:42 +0100 diff --git a/debian/control b/debian/control index 3e665d5..64b78f9 100644 --- a/debian/control +++ b/debian/control @@ -24,11 +24,11 @@ Package: x2gognomebindings Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - x2goserver (>=3.0.99.6-0~), + x2goserver (>=3.1.0.2-0~), + x2goserver-extensions, zenity, gnome-menus, - gnome-colors-common, - x2goserver-extensions + gnome-colors-common Description: Description: x2gognomebindings (GNOME mimetypes for X2go) X2go is a server based computing environment with - session resuming hooks/post-receive -- x2gognomebindings.git (GNOME bindings for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gognomebindings.git" (GNOME bindings for X2Go).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.4-2-g0bb5890
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via 0bb58902760aec107e45c8b7981ac14e07d7715f (commit) from ae15cf9ba1b6f589bb18fa4a517532ced574d6c0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0bb58902760aec107e45c8b7981ac14e07d7715f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 12:09:23 2012 +0100 Let GNOME sessions started via X2Go ignore GNOME's monitor settings in ~/.config/monitors.xml. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++- debian/control | 3 +- debian/x2gognomebindings.install | 1 + .../pre-runcommand.d/005_GNOME-monitors-xml-ignore | 24 +++++++------------ 4 files changed, 15 insertions(+), 17 deletions(-) copy share/x2go/x2gofeature.d/x2goserver-gnomebindings.features => lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore (55%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 956738d..6111a3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2gognomebindings (2.0.1.5-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (2.0.1.5): + - Let GNOME sessions started via X2Go ignore GNOME's monitor settings + in ~/.config/monitors.xml. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:41:42 +0100 diff --git a/debian/control b/debian/control index 9ed0e3b..3e665d5 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,8 @@ Depends: ${shlibs:Depends}, x2goserver (>=3.0.99.6-0~), zenity, gnome-menus, - gnome-colors-common + gnome-colors-common, + x2goserver-extensions Description: Description: x2gognomebindings (GNOME mimetypes for X2go) X2go is a server based computing environment with - session resuming diff --git a/debian/x2gognomebindings.install b/debian/x2gognomebindings.install index f07eb37..9a644df 100644 --- a/debian/x2gognomebindings.install +++ b/debian/x2gognomebindings.install @@ -7,4 +7,5 @@ VERSION.x2gognomebindings usr/share/x2go/versions/ #extension/libnautilus-x2goumount.la usr/lib/nautilus/extensions-2.0/ #extension/libnautilus-x2goumount.so usr/lib/nautilus/extensions-2.0/ share/* usr/share/ +lib/* usr/lib/ xdg-menus/* etc/xdg/menus/ \ No newline at end of file diff --git a/share/x2go/x2gofeature.d/x2goserver-gnomebindings.features b/lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore similarity index 55% copy from share/x2go/x2gofeature.d/x2goserver-gnomebindings.features copy to lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore index fb25030..c8d416a 100755 --- a/share/x2go/x2gofeature.d/x2goserver-gnomebindings.features +++ b/lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# Copyright (C) 2012 X2Go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,20 +17,14 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_SESSION=$1 -$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" - -X2GO_FEATURE=$1 - -# check for X2go server core features -case "$X2GO_FEATURE" in - - "X2GO_GNOMEBINDINGS") echo "ok"; exit 0;; - *) exit -1;; - -esac +# GNOME's monitors.xml breaks full screen mode of X2Go/NX +if echo $X2GO_SESSION | egrep "$USER-[[:digit:]]{2,}-[[:digit:]]+_stDGNOME_dp.*" >/dev/null; then + test -w ~/.config/monitors.xml && mv ~/.config/monitors.xml ~/.config/monitors.xml.disabled-for-X2Go-session-start + (sleep 20; test -w ~/.config/monitors.xml.disabled-for-X2Go-session-start && mv ~/.config/monitors.xml.disabled-for-X2Go-session-start ~/.config/monitors.xml;)& +fi +exit 0 hooks/post-receive -- x2gognomebindings.git (GNOME bindings for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gognomebindings.git" (GNOME bindings for X2Go).

1 0

x2goserver.git - master (branch) updated: 3.1.0.1-5-g15a647a
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via 15a647adc8f64e964fd01a18369c2b5783c53157 (commit) via 26ffae24c0b9a5040781ff84705258a15e017417 (commit) via a9973bc2ca40e0d4e8ff1cacc799844eaf6ea695 (commit) via 840c71310f06661b9d487aefe8d088a2d237c8d1 (commit) from ca589f22db4536a8bff1f9f3b714fcff8caeb9c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 15a647adc8f64e964fd01a18369c2b5783c53157 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 12:04:30 2012 +0100 Fix x2goserver extension calls in x2goruncommand. commit 26ffae24c0b9a5040781ff84705258a15e017417 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 11:02:15 2012 +0100 Fix syslog output of x2goserver-run-exentions. commit a9973bc2ca40e0d4e8ff1cacc799844eaf6ea695 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 11:01:04 2012 +0100 Add usage output to x2goserver-run-extensions. commit 840c71310f06661b9d487aefe8d088a2d237c8d1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 10:58:49 2012 +0100 Syslog warnings have to be named ,,warning'' not ,,warn''. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++++- .../bin/x2goserver-run-extensions | 6 ++++-- x2goserver/bin/x2goruncommand | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3087bfb..fbf1141 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2goserver (3.1.0.2-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (3.1.0.2): + - Syslog warnings have to be named ,,warning'' not ,,warn''. + - Add usage output to x2goserver-run-extensions. + - Fix syslog output of x2goserver-run-exentions. + - Fix x2goserver extension calls in x2goruncommand. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:08:33 +0100 diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index c7b671c..70636f6 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -23,6 +23,8 @@ set -e +test -z $2 && { echo "usage: $(basename $0) <X2GO_SESSION_ID> <MODALITY>"; exit -1; } + X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" @@ -34,9 +36,9 @@ X2GO_MODALITY="$2" find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" $x2go_extension "$X2GO_SESSION" &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully" + $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension ($(basename $0)) for session $X2GO_SESSION has finished sucessfully" } || { - $X2GO_LIB_PATH/x2gosyslog "$0" "warn" "$x2go_extension$(basename $0) for session $X2GO_SESSION returned a non-zero exit code, continuing..." + $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "$x2go_extension ($(basename $0)) for session $X2GO_SESSION returned a non-zero exit code, continuing..." } done diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index fd9f82d..c73cb6a 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -123,7 +123,7 @@ then fi # run x2goserver-extensions for pre-runcommand -x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-runcommand || true +x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" pre-runcommand || true sucessful_run=false if [ "$EXEC" != "" ] && [ -x $EXEC ]; then @@ -148,14 +148,14 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then successful_run=true # run x2goserver-extensions for post-runcommand - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-runcommand || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" post-runcommand || true else $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: command $EXEC failed to execute" echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > "$MESSAGE_FILE" # run x2goserver-extensions for fail-runcommand - x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-runcommand || true + x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" fail-runcommand || true fi hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-124-gb9421ed
by git-admin＠x2go.org 07 Mar '12

07 Mar '12

The branch, master has been updated via b9421ed58590787180ae7069108d926a314bbda7 (commit) from a181afeb662be2a2c6fb39f8216b520041c57059 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b9421ed58590787180ae7069108d926a314bbda7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 00:37:56 2012 +0100 fix setting of session window title on Unix platforms (after changing stuff on Windows) ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 2 +- x2go/utils.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 1d59497..f64663d 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -828,7 +828,7 @@ class X2goTerminalSessionSTDOUT(object): timeout -= 1 if self.session_window is not None: - utils.set_session_window_title(self.session_window) + utils.set_session_window_title(self.session_window, self.session_title) break gevent.sleep(1) diff --git a/x2go/utils.py b/x2go/utils.py index 979e645..15a544d 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -491,17 +491,19 @@ def find_session_window(session_name): return None -def set_session_window_title(session_window): +def set_session_window_title(session_window, session_title): """\ Set title of session window. @param session_window: session window instance @type session_window: C{obj} + @param session_title: session title to be set for C{session_window} + @type session_title: C{str} """ if _X2GOCLIENT_OS != 'Windows': - self.session_window.set_wm_name(str(self.session_title)) - self.session_window.set_wm_icon_name(str(self.session_title)) + session_window.set_wm_name(str(session_title)) + session_window.set_wm_icon_name(str(session_title)) _X_DISPLAY.sync() def raise_session_window(session_window): @@ -512,4 +514,4 @@ def raise_session_window(session_window): @type session_window: C{obj} """ - pass \ No newline at end of file + pass hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

← Newer
1
...
12
13
14
15
16
17
18
19
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits March 2012