x2go-commits February 2012

x2go-commits@lists.x2go.org

1 participants
198 discussions

cups-x2go.git - master (branch) updated: 3.0.0.3-3-g6a7c597
by git-admin＠x2go.org 18 Feb '12

18 Feb '12

The branch, master has been updated via 6a7c597b3fa5004c1d24640c48dbca4bf718c180 (commit) from ea845a5c5a6c5ff3dfabfe7a77e4a0d120d8f57a (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 6a7c597b3fa5004c1d24640c48dbca4bf718c180 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Feb 18 01:53:12 2012 +0100 Use proper project name where appropriate and possible (,,X2Go''). ----------------------------------------------------------------------- Summary of changes: CUPS-X2GO.ppd | 8 ++++---- cups-x2go | 16 ++++++++-------- cups-x2go.conf | 6 +++--- debian/changelog | 1 + debian/control | 6 +++--- 5 files changed, 19 insertions(+), 18 deletions(-) The diff of changes is: diff --git a/CUPS-X2GO.ppd b/CUPS-X2GO.ppd index 7ecd5e6..d3d5207 100644 --- a/CUPS-X2GO.ppd +++ b/CUPS-X2GO.ppd @@ -28,10 +28,10 @@ *PCFileName: "CUPS-X2GO.PPD" *Manufacturer: "Generic" *Product: "(CUPS v1.1)" -*ModelName: "Generic CUPS-X2GO Printer" -*ShortNickName: "Generic CUPS-X2GO Printer" -*NickName: "Generic CUPS-X2GO Printer" -*1284DeviceID: "MFG:Generic;MDL:CUPS-X2GO Printer;DES:Generic CUPS-X2GO Printer;CLS:PRINTER;CMD:POSTSCRIPT;" +*ModelName: "Generic CUPS-X2Go Printer" +*ShortNickName: "Generic CUPS-X2Go Printer" +*NickName: "Generic CUPS-X2Go Printer" +*1284DeviceID: "MFG:Generic;MDL:CUPS-X2Go Printer;DES:Generic CUPS-X2Go Printer;CLS:PRINTER;CMD:POSTSCRIPT;" *% cupsFilter: "application/vnd.cups-postscript 0 pstitleiconv" *PSVersion: "(2017.000) 0" *LanguageLevel: "2" diff --git a/cups-x2go b/cups-x2go index bc451f2..314eca6 100755 --- a/cups-x2go +++ b/cups-x2go @@ -1,6 +1,6 @@ #!/usr/bin/perl -# X2go CUPS backend +# X2Go CUPS backend # Copyright 2009-2011 Obviously Nice # # This program is free software; you can redistribute it and/or modify it @@ -26,13 +26,13 @@ use strict; openlog($0,'cons,pid','user'); -## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise -## name the hostname of your master X2go server within in your X2go cluster. This +## if the CUPS server is X2Go server at the same time, use ,,local'' here, otherwise +## name the hostname of your master X2Go server within in your X2Go cluster. This ## host then is used for querying session information. my $x2goserver = "local"; ## DSA key for user x2goprint (new path and filename, default in cups-x2go backend) -## this private key has to be valid for all X2go servers that print via the CUPS +## this private key has to be valid for all X2Go servers that print via the CUPS ## server that cups-x2go is installed on. The corresponding public key has to ## be installed in <remote-x2goserverX>:~x2goprint/.ssh/authorized_keys my $printdsa = "/root/.ssh/id_dsa-x2goprint"; @@ -118,7 +118,7 @@ sub getsessions { syslog("debug", "Querying remote X2Go server $x2goserver for a session list..."); # Calling x2goprint with a single parameter <username> will result in an - # x2golistsessions --all-servers command on the remote X2go server. + # x2golistsessions --all-servers command on the remote X2Go server. $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "sudo x2goprint $userName"`; } syslog("debug", $sesslist); @@ -146,7 +146,7 @@ sub printfile } else { - # push spool job to remote X2go server... and launch x2goprint there (with sudo!!!) + # push spool job to remote X2Go server... and launch x2goprint there (with sudo!!!) # PDF file syslog('debug', "scp -i $printdsa $pfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname"); @@ -154,7 +154,7 @@ sub printfile # title file syslog('debug', "scp -i $printdsa $tfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname.title"); system ("scp -i $printdsa $tfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname.title"); - # run x2goprint on remote X2go server + # run x2goprint on remote X2Go server syslog('debug', "ssh -i $printdsa x2goprint\@$x2gosession_host \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); system( "ssh -i $printdsa x2goprint\@$x2gosession_host \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); @@ -166,7 +166,7 @@ sub printfile if (!$ARGV[0]) { - print "file cups-x2go:/ \"Virtual X2GO Printer\" \"CUPS-X2GO\" \"MFG:Generic;MDL:CUPS-X2GO Printer;DES:Generic CUPS-X2GO Printer;CLS:PRINTER;CMD:POSTSCRIPT;\"\n"; + print "file cups-x2go:/ \"Virtual X2Go Printer\" \"CUPS-X2Go\" \"MFG:Generic;MDL:CUPS-X2Go Printer;DES:Generic CUPS-X2Go Printer;CLS:PRINTER;CMD:POSTSCRIPT;\"\n"; exit 0; } diff --git a/cups-x2go.conf b/cups-x2go.conf index e44f6dc..0e67c77 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -2,13 +2,13 @@ ### cups-x2go.conf -- CUPS Backend Configuration ### -## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise -## name the hostname of your master X2go server within in your X2go cluster. This +## if the CUPS server is X2Go server at the same time, use ,,local'' here, otherwise +## name the hostname of your master X2Go server within in your X2Go cluster. This ## host then is used for querying session information. #x2goserver = local ## DSA key for user x2goprint (new path and filename, default in cups-x2go backend) -## this private key has to be valid for all X2go servers that print via the CUPS +## this private key has to be valid for all X2Go servers that print via the CUPS ## server that cups-x2go is installed on. The corresponding public key has to ## be installed in <remote-x2goserverX>:~x2goprint/.ssh/authorized_keys #printdsa = /root/.ssh/id_dsa-x2goprint diff --git a/debian/changelog b/debian/changelog index 3671c81..0434232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ cups-x2go (3.0.0.4-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.0.0.4): - Add more debug messages. + - Use proper project name where appropriate and possible (,,X2Go''). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Oct 2011 02:07:16 +0200 diff --git a/debian/control b/debian/control index efc9df0..c89383c 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Depends: ghostscript, cups-client, cups -Description: X2GO printer for CUPS - X2go is a server based computing environment with +Description: Virtual X2Go printer for CUPS + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -26,4 +26,4 @@ Description: X2GO printer for CUPS - audio support - authentication by smartcard and USB stick . - CUPS-X2GO provides an X2go backend to CUPS. + CUPS-X2Go provides a CUPS-backend for X2Go printing. hooks/post-receive -- cups-x2go.git (CUPS Backend for X2Go Printing) 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 "cups-x2go.git" (CUPS Backend for X2Go Printing).

1 0

x2goserver.git - master (branch) updated: 3.0.99.10-18-gb153654
by git-admin＠x2go.org 18 Feb '12

18 Feb '12

The branch, master has been updated via b1536548a685d8fc96640a42fdea53e5281a9072 (commit) from 51771f645ffa60d561e156847dbc79cce6b41d4d (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 b1536548a685d8fc96640a42fdea53e5281a9072 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Feb 18 01:25:47 2012 +0100 whitespace fix ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gostartagent | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index fa173c5..2dbaf0a 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -244,7 +244,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 -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

python-x2go.git - master (branch) updated: 0.1.1.4-107-gb3bf6d6
by git-admin＠x2go.org 18 Feb '12

18 Feb '12

The branch, master has been updated via b3bf6d63c5914984585e64d68630e0ac9bced9ec (commit) from 5c9240773522ae67692763d9061ea800b19000b7 (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 b3bf6d63c5914984585e64d68630e0ac9bced9ec Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Feb 18 01:21:25 2012 +0100 Fix X2Go desktop sharing support. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 3 ++- x2go/session.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f79952c..7214750 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Fix IndexError if x2gomountdirs did not deliver any of the expected results to stdout. - Handle session titles that just contain blanks (e.g. " ") gracefully. + - Fix X2Go desktop sharing support. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 0918ec8..565c6af 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -126,7 +126,7 @@ class X2goSessionParams(object): self.session_type = 'D' elif os.path.basename(cmd) in defaults.X2GO_DESKTOPSESSIONS.values(): self.session_type = 'D' - else: + elif self.session_type not in ("S", "shared", "shadow", "D", "desktop"): self.session_type = 'R' if self.session_type in ("D", "desktop"): @@ -588,6 +588,7 @@ class X2goTerminalSessionSTDOUT(object): """\ Return the server-side mimebox spooldir path. + """ return '%s/%s' % (self.session_info.remote_container, 'mimebox') diff --git a/x2go/session.py b/x2go/session.py index 1ac2f64..5d58b63 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1248,7 +1248,7 @@ class X2goSession(object): if not _desktop in self._X2goSession__list_desktops(): _orig_desktop = _desktop _desktop = '%s.0' % _desktop - if not _desktop in self._X2GoSession__list_desktops(): + if not _desktop in self._X2goSession__list_desktops(): raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop) _session_owner = _desktop.split('@')[0] 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

x2goserver.git - master (branch) updated: 3.0.99.10-17-g51771f6
by git-admin＠x2go.org 17 Feb '12

17 Feb '12

The branch, master has been updated via 51771f645ffa60d561e156847dbc79cce6b41d4d (commit) from c557ccdfbfac96bfa63e14d522999a20a7b2c57a (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 51771f645ffa60d561e156847dbc79cce6b41d4d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 17 23:38:00 2012 +0100 Allow other $XAUTHORITY values than the default ($HOME/.Xauthority). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gostartagent | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 39475db..1a350d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - Provide new package x2goserver-fmbindings. Derived from a package draft provided by Milan Knížek (Thanks!). - Do not create desktop icons for rootless (i.e. non-desktop) sessions. + - Allow other $XAUTHORITY values than the default ($HOME/.Xauthority). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 4951c0b..fa173c5 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -45,6 +45,8 @@ X2GO_CMD=$1; shift X2GO_RESIZE=0 X2GO_FULLSCREEN=0 +XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"} + if [ "$X2GO_STYPE" == "S" ]; then SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'` @@ -240,9 +242,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSIO 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 & + 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 -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

x2goserver.git - master (branch) updated: 3.0.99.10-16-gc557ccd
by git-admin＠x2go.org 17 Feb '12

17 Feb '12

The branch, master has been updated via c557ccdfbfac96bfa63e14d522999a20a7b2c57a (commit) from b5a057b8b849d74bae0a1aabc16989ca594a5b6a (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 c557ccdfbfac96bfa63e14d522999a20a7b2c57a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 17 23:32:40 2012 +0100 Revert "Remove -auth /home/mike/.Xauthority option from x2goagent start-up command line as it breaks .Xauthority path names of GDM and other display managers." This reverts commit b5a057b8b849d74bae0a1aabc16989ca594a5b6a. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 -- x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1afd5fe..39475db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,6 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - Fix removal of desktop link on x2goumount-session if local folder of a Windows client gets unmounted. - Remove redundant -S option from x2goagent start-up command line. - - Remove -auth $HOME/.Xauthority option from x2goagent start-up command line - as it breaks .Xauthority path names of GDM and other display managers. [ Sören Plönnigs ] * New upstream version (3.1.0.0): diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 31af841..4951c0b 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -240,9 +240,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSIO SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then - x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + 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 -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -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

x2goserver.git - master (branch) updated: 3.0.99.10-15-gb5a057b
by git-admin＠x2go.org 17 Feb '12

17 Feb '12

The branch, master has been updated via b5a057b8b849d74bae0a1aabc16989ca594a5b6a (commit) via c4a1ea405879b07d351b6c10da02bb891c02c45b (commit) via 53a830ca3b3ecde7acab042323f00c988756c47d (commit) via ce30528b3b0ba6252e6617a835fd0909274a9759 (commit) from 9d58cdf8b93ba5f041bb643d6b28214493cc8353 (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 b5a057b8b849d74bae0a1aabc16989ca594a5b6a Author: Milan Knížek <knizek.confy(a)gmail.com> Date: Fri Feb 17 22:55:41 2012 +0100 Remove -auth /home/mike/.Xauthority option from x2goagent start-up command line as it breaks .Xauthority path names of GDM and other display managers. commit c4a1ea405879b07d351b6c10da02bb891c02c45b Author: Milan Knížek <knizek.confy(a)gmail.com> Date: Fri Feb 17 22:50:48 2012 +0100 Remove redundant -S option from x2goagent start-up command line. commit 53a830ca3b3ecde7acab042323f00c988756c47d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 17 22:45:59 2012 +0100 Do not create desktop icons for rootless (i.e. non-desktop) sessions. commit ce30528b3b0ba6252e6617a835fd0909274a9759 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 17 22:33:29 2012 +0100 add FIXME to x2gomountdirs ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2gomountdirs | 7 ++++--- x2goserver/bin/x2gostartagent | 4 ++-- x2goserver/bin/x2goumount-session | 6 +++--- 4 files changed, 13 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f0d4be2..1afd5fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.0.0): - Fix removal of desktop link on x2goumount-session if local folder of a Windows client gets unmounted. + - Remove redundant -S option from x2goagent start-up command line. + - Remove -auth $HOME/.Xauthority option from x2goagent start-up command line + as it breaks .Xauthority path names of GDM and other display managers. [ Sören Plönnigs ] * New upstream version (3.1.0.0): @@ -29,6 +32,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.0.0): - Provide new package x2goserver-fmbindings. Derived from a package draft provided by Milan Knížek (Thanks!). + - Do not create desktop icons for rootless (i.e. non-desktop) sessions. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index c1b4d3a..0b77039 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -264,17 +264,18 @@ for (my $i=0;$i<@dirs;$i++) } if (! $printspool && ! $mimeboxspool && ! $useplasmoid ) { + my $fname="$ENV{'HOME'}/Desktop"; my $current_desktop = "NONE"; - if (($session =~ m/stDGNOME/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0) + if (($session =~ m/_stDGNOME_dp/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0) { $current_desktop="-gnome"; } - elsif (($session =~ m/stDLXDE/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) + elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; } - elsif (system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0) + elsif (($session =~ m/_stD.*_dp/) && system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0) { $current_desktop=""; } diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 3b802b4..31af841 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -240,9 +240,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSIO SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then - x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -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 -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & fi diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 64876d9..d9fcdfe 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -130,15 +130,15 @@ break: $remote="$ENV{'HOME'}/Desktop/$remote"; my $current_desktop = 'NONE'; - if (($session =~ m/stDGNOME/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0) + if (($session =~ m/_stDGNOME_dp/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0) { $current_desktop="-gnome"; } - elsif (($session =~ m/stDLXDE/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) + elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; } - elsif (system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0) + elsif (($session =~ m/_st.*_dp/) && system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0) { $current_desktop=""; } 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

x2goserver.git - master (branch) updated: 3.0.99.10-11-g9d58cdf
by git-admin＠x2go.org 17 Feb '12

17 Feb '12

The branch, master has been updated via 9d58cdf8b93ba5f041bb643d6b28214493cc8353 (commit) from 3a1746539fe58fb31aab0eb6862647d279890edf (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 9d58cdf8b93ba5f041bb643d6b28214493cc8353 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 17 22:30:59 2012 +0100 remove cruft (version file at irrelevant location) ----------------------------------------------------------------------- Summary of changes: x2goserver/share/x2go/versions/VERSION.x2goserver | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) delete mode 120000 x2goserver/share/x2go/versions/VERSION.x2goserver The diff of changes is: diff --git a/x2goserver/share/x2go/versions/VERSION.x2goserver b/x2goserver/share/x2go/versions/VERSION.x2goserver deleted file mode 120000 index fc1b443..0000000 --- a/x2goserver/share/x2go/versions/VERSION.x2goserver +++ /dev/null @@ -1 +0,0 @@ -../../../VERSION.x2goserver \ No newline at end of file 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

x2goserver.git - master (branch) updated: 3.0.99.10-10-g3a17465
by git-admin＠x2go.org 17 Feb '12

17 Feb '12

The branch, master has been updated via 3a1746539fe58fb31aab0eb6862647d279890edf (commit) from 745b2b21be2df3a91bf8c0870054cbc2138b37e1 (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 3a1746539fe58fb31aab0eb6862647d279890edf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 17 21:25:24 2012 +0100 Provide new package x2goserver-fmbindings. Derived from a package draft provided by Milan Knížek (Thanks!). ----------------------------------------------------------------------- Summary of changes: Makefile | 6 +++ debian/changelog | 5 ++ debian/control | 28 ++++++++++++ ...-extensions.dirs => x2goserver-fmbindings.dirs} | 0 debian/x2goserver-fmbindings.install | 3 + ...rver.preinst => x2goserver-fmbindings.postinst} | 26 +++++------- ...rinting.postrm => x2goserver-fmbindings.postrm} | 32 +++++++------- .../Makefile | 37 ++++------------ .../VERSION.x2goserver-fmbindings | 1 + x2goserver-fmbindings/bin/x2gofm | 8 ++++ .../share/applications/x2gofm.desktop | 9 ++++ .../share/mime/packages/sshfs-x2go.xml | 21 +++++++++ .../x2gofeature.d/x2goserver-fmbindings.features | 10 ++-- x2goserver/bin/x2gomountdirs | 45 +++++++++++-------- x2goserver/bin/x2goumount-session | 43 +++++++++++-------- 15 files changed, 174 insertions(+), 100 deletions(-) copy debian/{x2goserver-extensions.dirs => x2goserver-fmbindings.dirs} (100%) create mode 100644 debian/x2goserver-fmbindings.install copy debian/{x2goserver.preinst => x2goserver-fmbindings.postinst} (66%) copy debian/{x2goserver-printing.postrm => x2goserver-fmbindings.postrm} (59%) copy {x2goserver-xsession => x2goserver-fmbindings}/Makefile (59%) create mode 100644 x2goserver-fmbindings/VERSION.x2goserver-fmbindings create mode 100755 x2goserver-fmbindings/bin/x2gofm create mode 100644 x2goserver-fmbindings/share/applications/x2gofm.desktop create mode 100644 x2goserver-fmbindings/share/mime/packages/sshfs-x2go.xml copy x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features => x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features (74%) The diff of changes is: diff --git a/Makefile b/Makefile index 77ae676..da9d5db 100755 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ build_man2html: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ clean: @@ -19,6 +20,7 @@ clean: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ build-arch: @@ -27,6 +29,7 @@ build-arch: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ build-indep: @@ -35,6 +38,7 @@ build-indep: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ install: @@ -43,6 +47,7 @@ install: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ uninstall: @@ -51,4 +56,5 @@ uninstall: $(MAKE) -C x2goserver-compat $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ + $(MAKE) -C x2goserver-fmbindings $@ $(MAKE) -C x2goserver-pyhoca $@ diff --git a/debian/changelog b/debian/changelog index 159a8f5..f0d4be2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,11 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - Use /cgi-bin/man/ path in web'ified man pages. - Use ,,${MAKE}'' instead of ,,make'' in Makefile. + [ Mike Gabriel ] + * New upstream version (3.1.0.0): + - Provide new package x2goserver-fmbindings. Derived from a package draft + provided by Milan Knížek (Thanks!). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 x2goserver (3.0.99.10-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 0a51bcd..8ca849c 100644 --- a/debian/control +++ b/debian/control @@ -167,6 +167,33 @@ Description: X2Go server daemon scripts (Xsession runner) startups and many more Xsession related features on X2Go session login automagically. +Package: x2goserver-fmbindings +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), + desktop-file-utils, + xdg-utils +Description: Generic (freedesktop-based) file manager bindings for X2Go + X2Go is a server based computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + x2goserver-fmbindings contains generic MIME type information + for X2Go's local folder sharing. It can be used with all + freedesktop.org compliant desktop shells. + . + However, this package will be superseded by other, more specific + destkop binding components, if installed and being used with the + corresponding desktop shell: + - under LXDE by x2golxdebindings + - under GNOME by x2gognomebindings + - under KDE4 by plasma-widget-x2go + Package: x2goserver-pyhoca Architecture: all Depends: @@ -189,3 +216,4 @@ Description: X2Go server daemon scripts (add-ons for pyhoca client) Functionalities this package adds: - renaming of session window titles - setting detailled X keyboard parameters + diff --git a/debian/x2goserver-extensions.dirs b/debian/x2goserver-fmbindings.dirs similarity index 100% copy from debian/x2goserver-extensions.dirs copy to debian/x2goserver-fmbindings.dirs diff --git a/debian/x2goserver-fmbindings.install b/debian/x2goserver-fmbindings.install new file mode 100644 index 0000000..aeb426e --- /dev/null +++ b/debian/x2goserver-fmbindings.install @@ -0,0 +1,3 @@ +x2goserver-fmbindings/VERSION.x2goserver-fmbindings usr/share/x2go/versions/ +x2goserver-fmbindings/share/* usr/share/ +x2goserver-fmbindings/bin/* usr/bin/ diff --git a/debian/x2goserver.preinst b/debian/x2goserver-fmbindings.postinst similarity index 66% copy from debian/x2goserver.preinst copy to debian/x2goserver-fmbindings.postinst index 117bb2c..cbe42ae 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver-fmbindings.postinst @@ -1,5 +1,5 @@ #!/bin/sh -# preinst script for x2goserver +# postinst script for x2gognomebindings # # see: dh_installdeb(1) @@ -19,20 +19,18 @@ set -e case "$1" in - install|upgrade) - # cleanup old x2goserver installations - rm -Rfv /var/db/x2go/ - if getent group x2gousers >/dev/null; then - echo "The ,,x2gousers'' is no longer used by x2go and can be" - echo "removed as soon as no users are members of this group" - fi - ;; - abort-upgrade) - ;; + configure) + update-desktop-database + update-mime-database /usr/share/mime + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) - echo "preinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 1 - ;; + ;; esac # dh_installdeb will replace this with shell code automatically @@ -41,5 +39,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/debian/x2goserver-printing.postrm b/debian/x2goserver-fmbindings.postrm similarity index 59% copy from debian/x2goserver-printing.postrm copy to debian/x2goserver-fmbindings.postrm index 16b0f1e..4c31ba2 100755 --- a/debian/x2goserver-printing.postrm +++ b/debian/x2goserver-fmbindings.postrm @@ -1,7 +1,10 @@ -#! /bin/sh -# postrm script for x2goserver-printing +#!/bin/sh +# postrm script for x2gognomebindings # # see: dh_installdeb(1) + +set -e + # summary of how this script can be called: # * <postrm> `remove' # * <postrm> `purge' @@ -10,23 +13,22 @@ # * <new-postrm> `abort-install' # * <new-postrm> `abort-install' <old-version> # * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> -# for details, see /usr/share/doc/packaging-manual/ - -set -e +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package case "$1" in - purge) - getent passwd x2goprint >/dev/null && deluser x2goprint - getent group x2goprint >/dev/null && delgroup x2goprint - ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + update-desktop-database + update-mime-database /usr/share/mime + ;; + *) echo "postrm called with unknown argument \`$1'" >&2 - exit 0 - ;; + exit 1 + ;; esac # dh_installdeb will replace this with shell code automatically @@ -34,4 +36,4 @@ esac #DEBHELPER# -exit 0 \ No newline at end of file +exit 0 diff --git a/x2goserver-xsession/Makefile b/x2goserver-fmbindings/Makefile similarity index 59% copy from x2goserver-xsession/Makefile copy to x2goserver-fmbindings/Makefile index 7a56c87..c91d181 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -5,7 +5,6 @@ SHELL=/bin/bash INSTALL_DIR=install -d -o root -g root -m 755 INSTALL_FILE=install -o root -g root -m 644 -INSTALL_SYMLINK=ln -s -f INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f @@ -14,23 +13,22 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR= PREFIX=/usr/local ETCDIR=/etc/x2go -#BINDIR=$(PREFIX)/bin +BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin -#LIBDIR=$(PREFIX)/lib/x2go +LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go -#BIN_SCRIPTS=$(shell cd bin && ls) +BIN_SCRIPTS=$(shell cd bin && ls) #SBIN_SCRIPTS=$(shell cd sbin && ls) #LIB_FILES=$(shell cd lib && ls) -ETC_FILES=$(shell cd etc && ls) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) -#man_pages = `cd man && find * -type f` +man_pages = `cd man && find * -type f` -#MAN2HTML_BIN = man2html -#MAN2HTML_SRC = man -#MAN2HTML_DEST = .build_man2html/html +MAN2HTML_BIN = man2html +MAN2HTML_SRC = man +MAN2HTML_DEST = .build_man2html/html all: clean build @@ -53,25 +51,11 @@ clean_man2html: install: install_scripts install_config install_man install_version install_scripts: -# $(INSTALL_DIR) $(DESTDIR)$(BINDIR) -# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d -# $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ -# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) -# provide target dirs for X11 related symlinks - mkdir -p $(DESTDIR)/etc/X11/Xresources - mkdir -p $(DESTDIR)/etc/X11/Xsession.d - touch $(DESTDIR)/etc/X11/Xsession.options - $(INSTALL_FILE) etc/Xsession $(DESTDIR)$(ETCDIR)/ - $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ - $(INSTALL_SYMLINK) /etc/X11/Xsession.d $(DESTDIR)$(ETCDIR)/ - $(INSTALL_SYMLINK) /etc/X11/Xsession.options $(DESTDIR)$(ETCDIR)/ - install_man: # $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -82,17 +66,14 @@ install_man: install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver-xsession $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsession + $(INSTALL_FILE) VERSION.x2goserver-extensions $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: -# for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done -# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: - for file in $(ETC_FILES); do $(RM_FILE) $(DESTDIR)$(ETCDIR)/$$file; done uninstall_man: # for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done @@ -100,5 +81,5 @@ uninstall_man: # $(RM_DIR) $(DESTDIR)$(MANDIR) || true uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsession + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings new file mode 100644 index 0000000..f8d7555 --- /dev/null +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -0,0 +1 @@ +3.1.0.0 diff --git a/x2goserver-fmbindings/bin/x2gofm b/x2goserver-fmbindings/bin/x2gofm new file mode 100755 index 0000000..280d990 --- /dev/null +++ b/x2goserver-fmbindings/bin/x2gofm @@ -0,0 +1,8 @@ +#!/usr/bin/perl +use strict; + +my $fname=shift; +open(F,"<$fname") or die "can't open $fname"; +my $dir=<F>; +close(F); +system( "xdg-open $dir" ); diff --git a/x2goserver-fmbindings/share/applications/x2gofm.desktop b/x2goserver-fmbindings/share/applications/x2gofm.desktop new file mode 100644 index 0000000..d747b1e --- /dev/null +++ b/x2goserver-fmbindings/share/applications/x2gofm.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=x2gofm +MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go +Exec=x2gofm %f +Type=Application +Terminal=false +NoDisplay=true +Icon=file-manager diff --git a/x2goserver-fmbindings/share/mime/packages/sshfs-x2go.xml b/x2goserver-fmbindings/share/mime/packages/sshfs-x2go.xml new file mode 100644 index 0000000..f6e7a0d --- /dev/null +++ b/x2goserver-fmbindings/share/mime/packages/sshfs-x2go.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/sshfscdrom-x2go"> + <comment>SSHFS CDROM</comment> + <comment xml:lang="de">SSHFS CDROM</comment> + <glob pattern="* (sshfs-cdrom)"/> + <generic-icon name="folder-remote"/> + </mime-type> + <mime-type type="application/sshfsdisk-x2go"> + <comment>SSHFS Disk</comment> + <comment xml:lang="de">SSHFS Freigabe</comment> + <glob pattern="* (sshfs-disk)"/> + <generic-icon name="folder-remote"/> + </mime-type> + <mime-type type="application/sshfsremovable-x2go"> + <comment>SSHFS Removable</comment> + <comment xml:lang="de">SSHFS Gerät</comment> + <glob pattern="* (sshfs-removable)"/> + <generic-icon name="folder-remote"/> + </mime-type> +</mime-info> diff --git a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features similarity index 74% copy from x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features copy to x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features index cc20f85..c1d5827 100755 --- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features +++ b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2007-2011 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,8 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` @@ -26,10 +26,10 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_FEATURE=$1 -# check for X2Go server core features +# check for X2go server core features case "$X2GO_FEATURE" in - "X2GO_XSESSION") echo "ok"; exit 0;; + "X2GO_FMBINDINGS") echo "ok"; exit 0;; *) exit -1;; esac diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 0d52a7b..c1b4d3a 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -265,43 +265,50 @@ for (my $i=0;$i<@dirs;$i++) if (! $printspool && ! $mimeboxspool && ! $useplasmoid ) { my $fname="$ENV{'HOME'}/Desktop"; - my $current_desktop = ""; - if ($session =~ m/stDGNOME/) + my $current_desktop = "NONE"; + if (($session =~ m/stDGNOME/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0) { $current_desktop="-gnome"; } - elsif ($session =~ m/stDLXDE/) + elsif (($session =~ m/stDLXDE/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; } + elsif (system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0) + { + $current_desktop=""; + } my $p=@dirs[$i]; $p=~s/\/cygdrive\///g; $p=~s/\//_/g; $fname="$fname/$p"; - if ($type eq "dir") - { - $fname="$fname\ (sshfs-disk$current_desktop)"; - syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: client-side folder on harddrive"); - } - else + if ("$current_desktop" ne "NONE") { - if ($fname =~ m/CDROM/) + if ($type eq "dir") { - $fname="$fname\ (sshfs-cdrom$current_desktop)"; - syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: optical disc"); + $fname="$fname\ (sshfs-disk$current_desktop)"; + syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: client-side folder on harddrive"); } else { - $fname="$fname\ (sshfs-removable$current_desktop)"; - syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: removable device"); + if ($fname =~ m/CDROM/) + { + $fname="$fname\ (sshfs-cdrom$current_desktop)"; + syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: optical disc"); + } + else + { + $fname="$fname\ (sshfs-removable$current_desktop)"; + syslog('info', "creating desktop icon for ,,@dirs[$i]'' at ,,$fname'', media type is: removable device"); + } + $fname=~s/_ramdrive_mnt_//; } - $fname=~s/_ramdrive_mnt_//; + print "fname: $fname\n"; + open(F,">$fname"); + print F "$mntpath\n$session\n\n\0"; + close(F); } - print "fname: $fname\n"; - open(F,">$fname"); - print F "$mntpath\n$session\n\n\0"; - close(F); } } else diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index bf62f82..64876d9 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -113,11 +113,11 @@ break: syslog('err', "ERROR: failed to unmount @line[1]"); if ($use_zenity == 0) { - system("which kdialog &>/dev/null && kdialog --error \"@line[1]\"&"); + system("which kdialog &>/dev/null && kdialog --error \"ERROR (X2Go): Failed to unmount @line[1]\"&"); } else { - system("which zenity &>/dev/null && zenity --error --text \"@line[1]\"&"); + system("which zenity &>/dev/null && zenity --error --text \"ERROR (X2Go): Failed to unmount @line[1]\"&"); } } } @@ -129,31 +129,38 @@ break: $remote=(split(":","$remote"))[1]; $remote="$ENV{'HOME'}/Desktop/$remote"; - my $current_desktop = ''; - if ($session =~ m/stDGNOME/) + my $current_desktop = 'NONE'; + if (($session =~ m/stDGNOME/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0) { $current_desktop="-gnome"; } - elsif ($session =~ m/stDLXDE/) + elsif (($session =~ m/stDLXDE/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; } - - if ( -e "$remote\ (sshfs-disk$current_desktop)") - { - syslog('info', "removing desktop icon ,,$remote (sshfs-disk$current_desktop)''"); - unlink("$remote\ (sshfs-disk$current_desktop)"); - } - $remote=~s/%2framdrive%2fmnt%2f//; - if ( -e "$remote\ (sshfs-removable$current_desktop)") + elsif (system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0) { - syslog('info', "removing desktop icon ,,$remote\ (sshfs-removable$current_desktop)''"); - unlink("$remote\ (sshfs-removable$current_desktop)"); + $current_desktop=""; } - if ( -e "$remote\ (sshfs-cdrom/$current_desktop)") + + if ("$current_desktop" ne "NONE") { - syslog('info', "removing desktop icon ,,$remote\ (sshfs-cdrom$current_desktop)''"); - unlink("$remote\ (sshfs-cdrom$current_desktop)"); + if ( -e "$remote\ (sshfs-disk$current_desktop)") + { + syslog('info', "removing desktop icon ,,$remote (sshfs-disk$current_desktop)''"); + unlink("$remote\ (sshfs-disk$current_desktop)"); + } + $remote=~s/%2framdrive%2fmnt%2f//; + if ( -e "$remote\ (sshfs-removable$current_desktop)") + { + syslog('info', "removing desktop icon ,,$remote\ (sshfs-removable$current_desktop)''"); + unlink("$remote\ (sshfs-removable$current_desktop)"); + } + if ( -e "$remote\ (sshfs-cdrom/$current_desktop)") + { + syslog('info', "removing desktop icon ,,$remote\ (sshfs-cdrom$current_desktop)''"); + unlink("$remote\ (sshfs-cdrom$current_desktop)"); + } } db_deletemount ($session, @line[1]); rmdir (@line[1]); 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

x2golxdebindings.git - master (branch) updated: 1.0.1.1-4-g3b90061
by git-admin＠x2go.org 17 Feb '12

17 Feb '12

The branch, master has been updated via 3b90061afd411baf6dc570de15b3338147182dae (commit) from 7996595327eb35e013c9c6ff264da6d41bd5f5fe (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 3b90061afd411baf6dc570de15b3338147182dae Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 17 20:55:41 2012 +0100 fix wrong path for x2gofeature.d directory(2) ----------------------------------------------------------------------- Summary of changes: .../x2gofeature.d/x2goserver-lxdebindings.features | 36 ++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) create mode 100755 share/x2go/x2gofeature.d/x2goserver-lxdebindings.features The diff of changes is: diff --git a/share/x2go/x2gofeature.d/x2goserver-lxdebindings.features b/share/x2go/x2gofeature.d/x2goserver-lxdebindings.features new file mode 100755 index 0000000..035953d --- /dev/null +++ b/share/x2go/x2gofeature.d/x2goserver-lxdebindings.features @@ -0,0 +1,36 @@ +#!/bin/bash + +# Copyright (C) 2007-2011 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) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$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_LXDEBINDINGS") echo "ok"; exit 0;; + *) exit -1;; + +esac + hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2Go).

1 0

x2golxdebindings.git - master (branch) updated: 1.0.1.1-3-g7996595
by git-admin＠x2go.org 17 Feb '12

17 Feb '12

The branch, master has been updated via 7996595327eb35e013c9c6ff264da6d41bd5f5fe (commit) from 24c973a5f353fb839791522189d396c7f579c40a (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 7996595327eb35e013c9c6ff264da6d41bd5f5fe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 17 20:50:10 2012 +0100 fix wrong path for x2gofeature.d directory ----------------------------------------------------------------------- Summary of changes: .../x2gofeature.d/x2goserver-lxdebindings.features | 36 -------------------- 1 files changed, 0 insertions(+), 36 deletions(-) delete mode 100755 share/x2gofeature.d/x2goserver-lxdebindings.features The diff of changes is: diff --git a/share/x2gofeature.d/x2goserver-lxdebindings.features b/share/x2gofeature.d/x2goserver-lxdebindings.features deleted file mode 100755 index 035953d..0000000 --- a/share/x2gofeature.d/x2goserver-lxdebindings.features +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2007-2011 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) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` - -$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_LXDEBINDINGS") echo "ok"; exit 0;; - *) exit -1;; - -esac - hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2Go).

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2012