x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

x2goserver.git - build-main (branch) created: 3.0.99.6
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, build-main has been created at 322d387aa0bc77f31f1f0a255551ec756a4ff58f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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-2-335-g322d387
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via 322d387aa0bc77f31f1f0a255551ec756a4ff58f (commit) from c0d6fadd5bcb741e8a625d47881f507ad6e27135 (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 322d387aa0bc77f31f1f0a255551ec756a4ff58f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 12:07:16 2011 +0200 release 3.0.99.6, rework changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 199 +++++++++----------- x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- 4 files changed, 94 insertions(+), 111 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 05f065e..4dd9782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,131 +1,114 @@ -x2goserver (3.0.99.6-0~x2go1.1) UNRELEASED; urgency=low +x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low [ Mike Gabriel ] - * Rename x2goumount_session calls to x2goumount-session calls in x2goserver - internal scripts. + * New upstream version (3.0.99.6): + - Rename x2goumount_session calls to x2goumount-session calls in + x2goserver internal scripts. + - Re-arranged script files into /bin and /lib directories. + - Tab'ified all script files, proper indentation, coding style. + - Fix for x2gomountdirs, now also usernames containing blanks can use + local folder sharing. + - Provide C wrapper for setgid call of x2gosqlitewrapper.pl. Remove + dependency from perlsuid. + - Store SQLite db in /var/lib/x2go to comply to latest FHS. + - Add x2gobasepath script to reliably detect x2goserver install path. + - Add man page for x2gobasepath. + - Remove Debianisms from INSTALL howto. + - Add chromium-browser as possible WWWBROWSER to x2goruncommand. + - Add lxterminal as possible TERMINAL to x2goruncommand. + - Add LibreOffice.org as possible OFFICE application to x2goruncommand. + - Fix for TERMINAL command execution if konsole (KDE4) is installed on the + server (closes upstream issue #87). + - Silence x2golistsessions on missing session.log files. + - Add x2goprint user creation information to INSTALL howto. + - Add sanity checks to x2goprint, script can only be run as root. + - Fix x2goprint, add syslogging, add inline comments. + - Add script lib/x2gologlevel: introduce [log] section in x2goserver.conf + with only parameter ,,loglevel''. + - Initialize Syslog module for all Perl scripts in x2goserver package. + - Add debugging support for almost all DB functions in x2godbwrapper.pm, fix + for Syslog module initialization in all Perl scripts. + - Add info loglevel messages for all scripts in bin dir. + - Add notice messages for start, suspend, resume, terminate, mountdirs + actions. + - Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a + package. This has to be done by the scripts that use x2godbwrapper.pm. + - Add info loglevel messages for x2goserver-extensions scripts. + - Use usermapping for SSHFS mount points. + - Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out. + - Rename example user and group for session limits in x2goserver.conf so that + people do not get the idea to put users in x2gouser group. + - Add real error message if client fails to resume/suspend/terminate + a session. + - Present an ISO-8601 compliant datetime string in session lists + rendered by x2golistsessions (and similar) command(s). + - Silence knotify SIGHUP signals in case that no knotify is running in the + X2go session. + - Fix x2goumount-session for individual paths (folder type: disk), + ToDo: folder type CDROM and removable media. + - Let db_insertmount create a proper return value (success vs. failed). + - If resuming or suspending of a session fails, mark the session as + finished (because the session's x2goagent is very probably dead). + Do not write an error to stderr if x2goterminate-session fails (i.e. if + x2goagent is dead). + - Identified x2goumount script (x2goserver-compat) as a necessary + component of x2gognomebindings and moved it there (with new name: + x2goumount-session-gnome). + - Add x2golistmounts script to X2go server extensions. + - Add x2gofeature script and x2gofeature.d subscripts. + - Add x2gofeature man page. + - Move x2goversion script into x2goserver core. + - Add debug output around shadow session startup (in x2gostartagent). + - Pass extra argument $USER to client-mode x2godesktopsharing, requires + x2godesktopsharing (>=3.0.1.3) for it to work. + - Clean session dir ~/.x2go/C-<session_id> after session terminates, if not + running in debug mode. + - Change of Desktop icons for shared folders. This change is needed for + parallel installation of x2gognomebindings and x2golxdebindings. + - Terminate x2godesktopsharing cleanly for current session on + x2goterminate-session or when x2goruncommand is about to exit. + - Resume/suspend x2godesktopsharing during x2goresume-session, + x2gosuspend-session. + - Provide pluggable X2go extension system for main X2go server + functions. + - Provide man page for x2goserver-run-extensions that explains the new plug-in + mechanism of x2goserver. + + + * React to bug #627990, prefer man2html-base over man2html. - * Re-arranged script files in /bin and /lib directories, this is - still compensated by dh_install and dh_link and needs more work. - * Tab'ified all script files, proper indentation, coding style. - * Fix for x2gomountdirs, now also usernames containing blanks can use - local folder sharing. - * Provide C wrapper for setuid call of x2gosqlitewrapper.pl. Remove dependency - from perlsuid. + * Do not depend on package perlsuid anymore. * Use source format 3.0 (native). * Fix of Debian clean rules, fix of Makefile's clean rules. * Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint (instead ofB Conflicts). - * Switch to setgid instead of setuid for SQLite wrapper. * Tab'ified postinst/postrm scripts. - * Store SQLite db in /var/lib/x2go to comply to latest FHS. - * Tab'ified (forgotten) scripts in /usr/sbin. - * Tab'ified (forgotten) init script. - * Tab'ified (forgotten) scripts in x2goserver-extensions package. * Install internal x2goserver scripts to /usr/lib/x2go, make sure scripts in /usr/bin find these scripts. - * Add x2gobasepath script to reliably detect x2goserver install path. - * Add man page for x2gobasepath. - * Remove Debianisms from INSTALL howto. - * Add chromium-browser as possible WWWBROWSER to x2goruncommand. - * Add lxterminal as possible TERMINAL to x2goruncommand. - * Add LibreOffice.org as possible OFFICE application to x2goruncommand. - * Fix for TERMINAL command execution if konsole (KDE4) is installed on the - server (closes upstream issue #87). - * Silence x2golistsessions on missing session.log files. - * Create x2goprint user/group on package installation, add same info to - INSTALL howto. - * Add sanity checks to x2goprint, script can only be run as root. - * Fix x2goprint, add syslogging, add inline comments. - * Add script lib/x2gologlevel: introduce [log] section in x2goserver.conf - with only parameter ,,loglevel''. - * Change x2gologlevel script into a Perl module (and a script that calls it). - Using x2gologlevel function in x2goprint to set loglevel mask. - * Initialize Syslog module for all Perl scripts in x2goserver package. - * Add debugging support for almost all DB functions in x2godbwrapper.pm, fix - for Syslog module initialization in all Perl scripts. - * Add info loglevel messages for all scripts in bin dir. - * Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a - package. This has to be done by the scripts that use x2godbwrapper.pm. - * Add info loglevel messages for x2goserver-extensions scripts. - * Add debug messages to x2gomountdirs script. - * Use usermapping for SSHFS mount points. - * Add notice messages for start, suspend, resume, terminate, mountdirs - actions. - * Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out. - * Rename example user and group for session limits in x2goserver.conf so that - people do not get the idea to put users in x2gouser group. - * Makefile and man page area fix for x2goserver-extensions. * x2goserver.postinst: fix home path updates if new home path already exists - * Add real error message if client fails to resume/suspend/terminate - a session. - * SQLite DB backend: Fix typo in date format template. - * Present an ISO-8601 compliant datetime string in session lists - rendered by x2golistsessions (and similar) command(s). - * Silence knotify SIGHUP signals in case that no knotify is running in the - X2go session. - * Fix x2goumount-session for individual paths (folder type: disk), - ToDo: folder type CDROM and removable media. - * Let db_insertmount create a proper return value (success vs. failed). - * Improvement of man pages. - * Add return value information of X2go commands to man pages. - * If resuming or suspending of a session fails, mark the session has - finished (because the session's x2goagent is very probably dead). - Do not write an error to stderr if x2goterminate-session fails (i.e. if - x2goagent is dead). - * Man page update for x2gosession-terminate, x2gosession-resume. - * Split up x2goprint script + man page + adduser x2goprint as separate - package x2goserver-printing. - * Add man page for x2gobasepath and man page draft for x2gosessionlimit. - * Identified x2goumount script (x2goserver-compat) as a necessary component - of x2gognomebindings and moved it there (with new name: - x2goumount-session-gnome). - * Add x2golistmounts script to X2go server extensions. - * Add x2gofeature script and x2gofeature.d subscript for x2goserver-extensions - and x2goserver-printing. - * Add x2gofeature man page. - * Move x2goversion into x2goserver core package. - * Makefile update for including x2gofeature scripts into installation, minor - fixes to x2goserver core package Makefile. - * Add debug output around shadow session startup (in x2gostartagent). - * Pass extra argument $USER to client-mode x2godesktopsharing, requires - x2godesktopsharing (>=3.0.1.3) for it to work. - * Clean session dir ~/.x2go/C-<session_id> after session terminates, if not - running in debug mode. - * Change of Desktop icons for shared folders. This change is needed for - parallel installation of x2gognomebindings and x2golxdebindings. - * Only remove server-side session directory if x2goruncommand has not - failed. - * Syntax fix in x2golistsessions_sql, hopefully fixes broken - x2gocleansessions. - * Terminate x2godesktopsharing for current session on x2goterminate-session - or when x2goruncommand is about to exit. - * Resume/suspend x2godesktopsharing during x2goresume-session, - x2gosuspend-session. - * Provide pluggable X2go extension system for main X2go server - functions. - * Adapt to renaming of x2godesktopsharing scripts. - * Provide man page for x2goserver-run-extensions that explains the new plug-in - mechanism of x2goserver. - * X2go server extensions have to completely quiet, diverting stdout/stderr to - /dev/null. - * Fix for session dir cleanup, x2gologlevel returns int value, not string. + * Provide separate package x2goserver-printing: x2goprint script + man page + + adduser x2goprint. [ Moritz Strübe ] - * Make digits at the beginning of X2go server extension scripts a must, not a - suggestion. + * Improvements for new upstream version (3.0.99.6): + - Make digits at the beginning of X2go server extension scripts a must, not a + suggestion. [ Ivan Kabaivanov ] - * Makefile fix around man page installation in x2goserver-compat package. - * Makefile fix around man page installation in x2goserver-extensions package. - * Proof-reading code, fixing typos. + * Improvements for new upstream version (3.0.99.6): + - Many Makefile fixes around man page installation. + - Proof-reading code, fixing typos. [ Martin Oehler ] - * Removes old debug code fragment, fixes x2golistsessions parsing. + * Fixes for new upstream version (3.0.99.6): + - Removes old debug code fragment, fixes x2golistsessions parsing. [ Oleksandr Shneyder ] - * remove session directory after 10 sec delay to let x2goclient check cmdoutput file + * Improvements for new upstream version (3.0.99.6): + - Remove session directory after 10 sec delay to let x2goclient check + cmdoutput file. - -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Wed, 05 Oct 2011 14:25:12 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:44:59 +0200 x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 34936c7..36a9e31 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.0.99.5 \ No newline at end of file +3.0.99.6 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 34936c7..36a9e31 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.0.99.5 \ No newline at end of file +3.0.99.6 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 34936c7..36a9e31 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.0.99.5 \ No newline at end of file +3.0.99.6 \ 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

x2golxdebindings.git - master (branch) updated: d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce (commit) from 7929f975dae6b0430a1f0804eedfeee402023262 (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: VERSION.x2golxdebindings | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/VERSION.x2golxdebindings b/VERSION.x2golxdebindings index 0839c1f..8e3158a 100644 --- a/VERSION.x2golxdebindings +++ b/VERSION.x2golxdebindings @@ -1 +1 @@ -1.0.1.0 +1.0.1.1 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 - build-main (branch) updated: d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, build-main has been updated via d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce (commit) from 7929f975dae6b0430a1f0804eedfeee402023262 (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 d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 11:41:45 2011 +0200 version increment (forgotten) ----------------------------------------------------------------------- Summary of changes: VERSION.x2golxdebindings | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/VERSION.x2golxdebindings b/VERSION.x2golxdebindings index 0839c1f..8e3158a 100644 --- a/VERSION.x2golxdebindings +++ b/VERSION.x2golxdebindings @@ -1 +1 @@ -1.0.1.0 +1.0.1.1 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 - build-main (branch) updated: 1.0.1.1
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, build-main has been updated via 7929f975dae6b0430a1f0804eedfeee402023262 (commit) via d1bb1c99ae77b194b5ccb5d909c1aa17919a1730 (commit) via a288449b5dd0282d1080e1f5bafab45058891f63 (commit) via 4e5bbc5aa5a76de780ee7b4329f2a3b2405eb055 (commit) from 4d9c2a5660b0a9292af92ee06897b2f5606e0191 (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 | 15 ++++++++++----- debian/control | 4 ++-- share/mime/packages/sshfs-x2go-lxde.xml | 6 +++--- 3 files changed, 15 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5ac8866..168fbaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,17 @@ -x2golxdebindings (1.0.1.0-0~x2go1) UNRELEASED; urgency=low +x2golxdebindings (1.0.1.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] - * Imported original tarball version to X2go Git. + * New upstream version (1.0.1.1): + - Add icon symlinks for sshfs/LXDE MIME types. + - Use desktop icon names that contain the name of the + desktop session. + * Imported original tarball version (v1.0.1) to X2go Git. * Adds Debian/Ubuntu packaging (/debian folder). - * Add icon symlinks for sshfs/LXDE MIME types. * Depend on destop-file-utils. + * Depend on x2goserver (>=3.0.99.6). [ Milan Knížek ] - * Fix for wrong/test MIME type in x2gopcmanfm.desktop. + * New upstream version (1.0.1.1): + - Fix for wrong/test MIME type in x2gopcmanfm.desktop. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 15 Sep 2011 14:04:27 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:35:28 +0200 diff --git a/debian/control b/debian/control index ea84f81..513787c 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Package: x2golxdebindings Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, - x2goserver, + x2goserver (>=3.0.99.6-0~), lxde-icon-theme, desktop-file-utils Description: LXDE bindings for X2go @@ -25,5 +25,5 @@ Description: LXDE bindings for X2go - audio support - authentication by smartcard and USB stick . - x2golxdebindings contains LXDE mimetype information for X2go's + x2golxdebindings contains LXDE MIME type information for X2go's local folder sharing. diff --git a/share/mime/packages/sshfs-x2go-lxde.xml b/share/mime/packages/sshfs-x2go-lxde.xml index 2a1476a..b2f4979 100644 --- a/share/mime/packages/sshfs-x2go-lxde.xml +++ b/share/mime/packages/sshfs-x2go-lxde.xml @@ -3,16 +3,16 @@ <mime-type type="application/sshfscdrom-x2go-lxde"> <comment>SSHFS CDROM</comment> <comment xml:lang="de">SSHFS CDROM</comment> - <glob pattern="*(sshfs-cdrom)"/> + <glob pattern="* (sshfs-cdrom-lxde)"/> </mime-type> <mime-type type="application/sshfsdisk-x2go-lxde"> <comment>SSHFS Disk</comment> <comment xml:lang="de">SSHFS Freigabe</comment> - <glob pattern="*(sshfs-disk)"/> + <glob pattern="* (sshfs-disk-lxde)"/> </mime-type> <mime-type type="application/sshfsremovable-x2go-lxde"> <comment>SSHFS Removable</comment> <comment xml:lang="de">SSHFS Gerät</comment> - <glob pattern="*(sshfs-removable)"/> + <glob pattern="* (sshfs-removable-lxde)"/> </mime-type> </mime-info> 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: 7929f975dae6b0430a1f0804eedfeee402023262
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via 7929f975dae6b0430a1f0804eedfeee402023262 (commit) from d1bb1c99ae77b194b5ccb5d909c1aa17919a1730 (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 7929f975dae6b0430a1f0804eedfeee402023262 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 11:38:08 2011 +0200 release 1.0.1.1, rework changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5c70681..168fbaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,17 @@ -x2golxdebindings (1.0.1.0-0~x2go1) UNRELEASED; urgency=low +x2golxdebindings (1.0.1.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] - * Imported original tarball version to X2go Git. + * New upstream version (1.0.1.1): + - Add icon symlinks for sshfs/LXDE MIME types. + - Use desktop icon names that contain the name of the + desktop session. + * Imported original tarball version (v1.0.1) to X2go Git. * Adds Debian/Ubuntu packaging (/debian folder). - * Add icon symlinks for sshfs/LXDE MIME types. * Depend on destop-file-utils. - * Depend on x2goserver (>=3.0.99.6) and use desktop - icon names that contain the name of the desktop session. + * Depend on x2goserver (>=3.0.99.6). [ Milan Knížek ] - * Fix for wrong/test MIME type in x2gopcmanfm.desktop. + * New upstream version (1.0.1.1): + - Fix for wrong/test MIME type in x2gopcmanfm.desktop. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 15 Sep 2011 14:04:27 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:35:28 +0200 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

x2gognomebindings.git - build-main (branch) updated: 2.0.1.3
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, build-main has been updated via 8227f81ad06cfafd26de1fded85d355c1fefd110 (commit) via 87e635cc4e85e3eedee6b1dcbfc6cd85ba341bff (commit) via 7b3fe1e047ea49a18ec2ff8d68a828e80d5009ea (commit) via 50b5f49c02b336c3688b15641dd1a3232e2819a4 (commit) via 66c2defe1fec986c61ded31ba52e27bb6afbde6f (commit) via 59aca05b576ddf2e39ee68868d46a309d08dd2e8 (commit) via c696ecfde992559bde498140e79e4e57e36fe685 (commit) via 05cbc6bb0f576863a72cfbd0e6ffa6601e29890c (commit) via bd30c195b3b7dea414453908ebabf8a73c2ba48e (commit) via 8e182c47b6cd57587588f06e1bcfa00f11c29434 (commit) via 7576438990bbd9a19f5f51f9f0e4832492c9fe21 (commit) via 7dbcdf39f5d1199a4328782da6f15c0924c6cab6 (commit) via 9c89f8877e3a3f588b5aadf852c3412dc7e1f2c5 (commit) via 4d1dd7669b485d2da70cc847141b71206aac866f (commit) via b36385ad0b603cc5199e8b0e02bbab314764456d (commit) via b183ea694b44fe6577d8e84932ed67c301de47a9 (commit) via 9060986c69e16edd264718e6ae98af5b193300f5 (commit) via 9e2853604775816189c4be5d15314608539bfb8e (commit) via ab59153091cec9e90460ca9e4d2a9809839e08a6 (commit) via 429ccc31f02d8ce8e4f96b675e9755851864fe08 (commit) via cdd1cc7e08d3d2529df4b3a74517eb0bba8b58d1 (commit) via a37b43eed649c8ad1efa3d818c8c487e83fce408 (commit) via fbe08a140b91675624e8375c1679dffc58769bb0 (commit) via 2d64da9939a9261dca99d739a545896fac7fb0ac (commit) via eca466be460f30cb34ce7f440e64f92c642fc2cb (commit) via 54c5ddc3d01c520c0ee11c9f9a199a48d2d44f9d (commit) via b5a044d42a0828ad7711ff4ce22e02d1618e9005 (commit) via a244b778b899bbc484122c29c53ef899f6b62fbc (commit) via 3ee21b93af37ac7f65ed67117f5372d345025da0 (commit) via 910c5d8aca61ec68967fa8130bba0c0a3147da15 (commit) via d02b0dd7418bbdef56b29008f111899ed91fde3e (commit) from 506a0ec485312b5f7892cf159cfe96fd4838d6a7 (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: VERSION | 2 +- VERSION.x2gognomebindings | 1 + bin/x2gonautilus | 29 ++++++++ bin/x2gosuspend-session-gnome | 23 ++++++ bin/x2goumount-session-gnome | 62 +++++++++++++++++ debian/changelog | 32 +++++++++- debian/control | 37 ++++++----- debian/copyright | 34 +++++----- debian/dirs | 3 - debian/docs | 2 - debian/rules | 64 +++--------------- debian/source/format | 1 + debian/x2gognomebindings.dirs | 5 ++ debian/x2gognomebindings.docs | 3 + debian/x2gognomebindings.install | 10 +++ debian/x2gognomebindings.lintian-overrides | 3 + debian/x2gognomebindings.manpages | 2 + debian/{postinst => x2gognomebindings.postinst} | 0 debian/{postrm => x2gognomebindings.postrm} | 0 debian/{prerm => x2gognomebindings.prerm} | 0 extension/nautilus-x2goumount.c | 10 ++- man/man8/x2gonautilus.8 | 22 ++++++ man/man8/x2gosuspend-session-gnome.8 | 23 ++++++ man/man8/x2goumount-session-gnome.8 | 23 ++++++ sbin/update-gnome-menu-x2go | 72 ++++++++++++++++++++ share/applications/x2gonautilus.desktop | 3 +- share/applications/x2gosuspend.desktop | 2 + ...nome-mime-application-sshfscdrom-x2go-gnome.svg | 1 + .../gnome-mime-application-sshfscdrom.svg | 1 - ...gnome-mime-application-sshfsdisk-x2go-gnome.svg | 1 + .../mimetypes/gnome-mime-application-sshfsdisk.svg | 1 - ...-mime-application-sshfsremovable-x2go-gnome.svg | 1 + .../gnome-mime-application-sshfsremovable.svg | 1 - .../packages/{sshfs.xml => sshfs-x2go-gnome.xml} | 12 ++-- suspend/x2gosuspend-session-gnome | 3 - updatemenu/gnome-settingsx2go.menu | 19 ----- updatemenu/update-gnome-menu-x2go | 51 -------------- x2gonautilus/x2gonautilus | 8 -- xdg-menus/gnome-settings-x2go.menu | 13 ++++ 39 files changed, 389 insertions(+), 191 deletions(-) mode change 100644 => 120000 VERSION create mode 100644 VERSION.x2gognomebindings create mode 100755 bin/x2gonautilus create mode 100755 bin/x2gosuspend-session-gnome create mode 100755 bin/x2goumount-session-gnome delete mode 100644 debian/dirs delete mode 100644 debian/docs create mode 100644 debian/source/format create mode 100644 debian/x2gognomebindings.dirs create mode 100644 debian/x2gognomebindings.docs create mode 100644 debian/x2gognomebindings.install create mode 100644 debian/x2gognomebindings.lintian-overrides create mode 100644 debian/x2gognomebindings.manpages rename debian/{postinst => x2gognomebindings.postinst} (100%) mode change 100644 => 100755 rename debian/{postrm => x2gognomebindings.postrm} (100%) mode change 100644 => 100755 rename debian/{prerm => x2gognomebindings.prerm} (100%) mode change 100644 => 100755 create mode 100644 man/man8/x2gonautilus.8 create mode 100644 man/man8/x2gosuspend-session-gnome.8 create mode 100644 man/man8/x2goumount-session-gnome.8 create mode 100755 sbin/update-gnome-menu-x2go create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg rename share/mime/packages/{sshfs.xml => sshfs-x2go-gnome.xml} (58%) delete mode 100755 suspend/x2gosuspend-session-gnome delete mode 100644 updatemenu/gnome-settingsx2go.menu delete mode 100755 updatemenu/update-gnome-menu-x2go delete mode 100755 x2gonautilus/x2gonautilus create mode 100644 xdg-menus/gnome-settings-x2go.menu The diff of changes is: diff --git a/VERSION b/VERSION deleted file mode 100644 index 4dd0c8d..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.0.1.1 \ No newline at end of file diff --git a/VERSION b/VERSION new file mode 120000 index 0000000..b2d03ec --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +VERSION.x2gognomebindings \ No newline at end of file diff --git a/VERSION.x2gognomebindings b/VERSION.x2gognomebindings new file mode 100644 index 0000000..f7e7717 --- /dev/null +++ b/VERSION.x2gognomebindings @@ -0,0 +1 @@ +2.0.1.3 diff --git a/bin/x2gonautilus b/bin/x2gonautilus new file mode 100755 index 0000000..13c5fc3 --- /dev/null +++ b/bin/x2gonautilus @@ -0,0 +1,29 @@ +#!/usr/bin/perl + +# 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) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +use strict; + +my $fname=shift; +open(F,"<$fname") or die "can't open $fname"; +my $dir=<F>; +close(F); +system( "nautilus $dir" ); diff --git a/bin/x2gosuspend-session-gnome b/bin/x2gosuspend-session-gnome new file mode 100755 index 0000000..10ae9b6 --- /dev/null +++ b/bin/x2gosuspend-session-gnome @@ -0,0 +1,23 @@ +#!/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) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +x2gosuspend-session $X2GO_SESSION diff --git a/bin/x2goumount-session-gnome b/bin/x2goumount-session-gnome new file mode 100755 index 0000000..7133d07 --- /dev/null +++ b/bin/x2goumount-session-gnome @@ -0,0 +1,62 @@ +#!/usr/bin/perl + +# 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) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $fname=join(" ", @ARGV); +open(F,"<$fname") or die "can't open $fname"; +my $dir=<F>; +my $session=<F>; +close(F); + +$session=~s/\n//; + +chomp($dir); +my $uname=$ENV{'USER'}; + +my $use_zenity=0; + +if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +{ + $use_zenity=1; +} + +if(system( "fusermount -u $dir" ) == 0) +{ + unlink($fname); + db_deletemount( $session, $dir); + rmdir ($dir); +} +else +{ + if($use_zenity == 0) + { + system("kdialog --error \"Can't umount:\n $dir\"&"); + } + else + { + system("zenity --error --text \"Can't umount:\n $dir\"&"); + } +} diff --git a/debian/changelog b/debian/changelog index 523d8cd..8a9f072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +x2gognomebindings (2.0.1.3-0~x2go1) unstable; urgency=low + + * New upstream version (2.0.1.3): + - Move ,,x2goumount'' script into source project as ,,x2goumount-session-gnome''. + - Move x2gosuspend-session-gnome to /bin folder within source project. + - Add man pages for x2goumount-session-gnome, x2gosuspend-session-gnome. + - Add simple man page for x2gonautilus. + - Place x2go-suspend.desktop icon in GNOME Network submenu. + - Define unique MIME name spaces for X2go SSHFS GNOME icons. + - Rename sshfs.xml to sshfs-x2go-gnome.xml. + - Use desktop icon names that contain the name of the desktop session. + - Allow blanks in desktop icon names. + - Provide more GNOME'ish way to derive icon path name from GNOME object + URI. + - Let x2goumount-session-gnome be able to handle icons with blanks in + their name. + * Add gnome-menus as dependency. + * Now fully use debhelper for packaging. Fixed lintian issues. + * Use source format 3.0 (native). + * Add linitian-overrides an man pages to package. + * Depend on x2goserver (>=3.0.99.6). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:30:51 +0200 + +x2gognomebindings (2.0.1.2-0~x2go1) unstable; urgency=low + + * Adds x2goversion support + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 29 May 2011 22:36:34 +0200 + x2gognomebindings (2.0.1.1-0~x2go1) unstable; urgency=low * Changed upstream version numbering scheme @@ -6,7 +36,7 @@ x2gognomebindings (2.0.1.1-0~x2go1) unstable; urgency=low x2gognomebindings (2.0.1-1) unstable; urgency=low - * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + * Initial release. -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Wed, 27 Aug 2008 15:28:36 +0200 diff --git a/debian/control b/debian/control index 6b208c5..9ed0e3b 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,10 @@ Source: x2gognomebindings Section: gnome Priority: extra Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Uploaders: + Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: autotools-dev, - debhelper (>= 7), + debhelper (>= 7.0.50~), gnome-pkg-tools, intltool, libglade2-dev (>= 2.4), @@ -13,24 +15,27 @@ Build-Depends: autotools-dev, libgtk2.0-dev (>= 2.4), libnautilus-extension-dev (>= 2.14), pkg-config -Standards-Version: 3.7.3 -Homepage: http://obviously-nice.de/ +Standards-Version: 3.9.2 +Homepage: http://code.x2go.org/releases/source/x2gognomebindings +Vcs-Git: git://code.x2go.org/x2gognomebindings.git +Vcs-Browser: http://code.x2go.org/gitweb?p=x2gognomebindings.git;a=summary Package: x2gognomebindings Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - x2goserver, - zenity -Description: Description: x2gognomebindings (GNOME mimetypes for x2go) - x2go is a serverbased computing environment with - - session resuming - - low bandwith support - - LDAP support - - client side mass storage mounting support - - audio/arts support - - authentification by smartcard and usb-stick - - KDE control-center modules for administration - - KDE based tools for just in time messaging and client surveillance + x2goserver (>=3.0.99.6-0~), + zenity, + gnome-menus, + gnome-colors-common +Description: Description: x2gognomebindings (GNOME mimetypes 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 . - x2gognomebindings contains mimetype information for x2go. + x2gognomebindings contains MIME type information for X2go if used with + GNOME desktops. diff --git a/debian/copyright b/debian/copyright index 151f0b4..f93bbbe 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,22 +5,22 @@ It was downloaded from www.obviously-nice.de Upstream Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -Copyright (C) 2007 obviously nice - http://www.obviouslynice.de - -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., -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +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) 2007 Oleksandr Shneyder oleksandr.shneyder(a)obviously-nice.de @@ -31,8 +31,6 @@ heinz-m.graesing(a)obviously-nice.de On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. - - The Debian packaging is (C) 2007, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and is licensed under the GPL, see above. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index e4bd112..0000000 --- a/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/sbin -etc/xdg/menus \ No newline at end of file diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 50bd824..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -NEWS -README diff --git a/debian/rules b/debian/rules index cf73a3c..c4d4f8f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,59 +1,13 @@ #!/usr/bin/make -f -config.status: configure - dh_testdir - cp -v /usr/share/misc/config.sub config.sub - cp -v /usr/share/misc/config.guess config.guess - ./configure $(CROSS) --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" +%: + dh $@ -build: build-stamp -build-stamp: config.status - dh_testdir - $(MAKE) - touch $@ +override_dh_auto_configure: + cp /usr/share/misc/config.sub . + cp /usr/share/misc/config.guess . + dh_auto_configure -clean: - dh_testdir - dh_testroot - rm -f build-stamp - -[ ! -f po/Makefile ] || $(MAKE) -C po distclean - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean config.sub config.guess - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) DESTDIR=$(CURDIR)/debian/x2gognomebindings install - $(MAKE) -C po DESTDIR=$(CURDIR)/debian/x2gognomebindings install - install x2gonautilus/x2gonautilus $(CURDIR)/debian/x2gognomebindings/usr/bin/ - install suspend/x2gosuspend-session-gnome $(CURDIR)/debian/x2gognomebindings/usr/bin/ - install updatemenu/update-gnome-menu-x2go $(CURDIR)/debian/x2gognomebindings/usr/sbin/ - cp -ar share $(CURDIR)/debian/x2gognomebindings/usr/ - cp updatemenu/gnome-settingsx2go.menu $(CURDIR)/debian/x2gognomebindings/etc/xdg/menus - -binary-indep: build install -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_install: + make -C po DESTDIR=../debian/x2gognomebindings install + dh_auto_install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/x2gognomebindings.dirs b/debian/x2gognomebindings.dirs new file mode 100644 index 0000000..183c74f --- /dev/null +++ b/debian/x2gognomebindings.dirs @@ -0,0 +1,5 @@ +usr/bin +usr/sbin +etc/xdg/menus +usr/share/x2go +usr/share/x2go/versions diff --git a/debian/x2gognomebindings.docs b/debian/x2gognomebindings.docs new file mode 100644 index 0000000..bcb3587 --- /dev/null +++ b/debian/x2gognomebindings.docs @@ -0,0 +1,3 @@ +NEWS +README +debian/copyright diff --git a/debian/x2gognomebindings.install b/debian/x2gognomebindings.install new file mode 100644 index 0000000..f07eb37 --- /dev/null +++ b/debian/x2gognomebindings.install @@ -0,0 +1,10 @@ +bin/x2gosuspend-session-gnome usr/bin/ +bin/x2goumount-session-gnome usr/bin/ +bin/x2gonautilus usr/bin/ +sbin/update-gnome-menu-x2go usr/sbin/ +VERSION.x2gognomebindings usr/share/x2go/versions/ +# Installed into DESTDIR by Makefile +#extension/libnautilus-x2goumount.la usr/lib/nautilus/extensions-2.0/ +#extension/libnautilus-x2goumount.so usr/lib/nautilus/extensions-2.0/ +share/* usr/share/ +xdg-menus/* etc/xdg/menus/ \ No newline at end of file diff --git a/debian/x2gognomebindings.lintian-overrides b/debian/x2gognomebindings.lintian-overrides new file mode 100644 index 0000000..ad92f39 --- /dev/null +++ b/debian/x2gognomebindings.lintian-overrides @@ -0,0 +1,3 @@ +x2gognomebindings: postinst-has-useless-call-to-ldconfig +x2gognomebindings: postrm-has-useless-call-to-ldconfig +x2gognomebindings: pkg-has-shlibs-control-file-but-no-actual-shared-libs diff --git a/debian/x2gognomebindings.manpages b/debian/x2gognomebindings.manpages new file mode 100644 index 0000000..06e118b --- /dev/null +++ b/debian/x2gognomebindings.manpages @@ -0,0 +1,2 @@ +man/man8/*.8 + diff --git a/debian/postinst b/debian/x2gognomebindings.postinst old mode 100644 new mode 100755 similarity index 100% rename from debian/postinst rename to debian/x2gognomebindings.postinst diff --git a/debian/postrm b/debian/x2gognomebindings.postrm old mode 100644 new mode 100755 similarity index 100% rename from debian/postrm rename to debian/x2gognomebindings.postrm diff --git a/debian/prerm b/debian/x2gognomebindings.prerm old mode 100644 new mode 100755 similarity index 100% rename from debian/prerm rename to debian/x2gognomebindings.prerm diff --git a/extension/nautilus-x2goumount.c b/extension/nautilus-x2goumount.c index 80f33ed..081abbe 100644 --- a/extension/nautilus-x2goumount.c +++ b/extension/nautilus-x2goumount.c @@ -47,11 +47,13 @@ static void nautilus_x2goumount_execute (NautilusMenuItem *item) GList *files; files = (GList*)g_object_get_data (G_OBJECT (item), "files"); gchar* uri = nautilus_file_info_get_uri ((NautilusFileInfo *)files->data); - char* cmd=malloc(strlen(uri)+strlen("x2goumount")); - strcpy(cmd,"x2goumount "); - strcat(cmd, uri+7); + gchar *file_path = g_filename_from_uri (uri, NULL, NULL); + char* cmd=malloc(strlen(file_path)+strlen("x2goumount-session-gnome")); + strcpy(cmd,"x2goumount-session-gnome "); + strcat(cmd, file_path); g_spawn_command_line_async (cmd, NULL); - g_free (uri); + g_free (uri); + g_free (file_path); } static const gchar* get_verified_icon_name (const gchar* icon_name) diff --git a/man/man8/x2gonautilus.8 b/man/man8/x2gonautilus.8 new file mode 100644 index 0000000..d99667f --- /dev/null +++ b/man/man8/x2gonautilus.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gonautilus 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" +.SH NAME +x2gonautilus \- X2go GNOME Wrapper for Browsing X2go Shared Folders with Nautilus +.SH SYNOPSIS +'nh +.fi +.ad l +x2gonautilus <path> + +.SH DESCRIPTION +\fBx2gonautilus\fR is a component of the X2go GNOME bindings and a simple wrapper GNOME's Nautilus +file browser for X2go-base shared folders. +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/man/man8/x2gosuspend-session-gnome.8 b/man/man8/x2gosuspend-session-gnome.8 new file mode 100644 index 0000000..749b7a9 --- /dev/null +++ b/man/man8/x2gosuspend-session-gnome.8 @@ -0,0 +1,23 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gosuspend-session-gnome 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" +.SH NAME +x2gosuspend-session-gnome \- X2go GNOME Binding for X2go Server: Suspend X2go Sessions from GNOME Menu +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosuspend-session-gnome <session_id> + +.SH DESCRIPTION +\fBx2gosuspend-gnome-session\fR is a component of the X2go GNOME bindings and a simple wrapper around the X2go Server +script ,,x2gosuspend-session''--with the potentials to be customized for X2go on GNOME desktops. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/man/man8/x2goumount-session-gnome.8 b/man/man8/x2goumount-session-gnome.8 new file mode 100644 index 0000000..f8d50ea --- /dev/null +++ b/man/man8/x2goumount-session-gnome.8 @@ -0,0 +1,23 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goumount-session-gnome 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" +.SH NAME +x2goumount-session-gnome \- X2go GNOME Binding for X2go Server: Unmount shared folder via Nautilus +.SH SYNOPSIS +'nh +.fi +.ad l +x2goumount-session-gnome <arg1> <arg2> ... + +.SH DESCRIPTION +\fBx2goumount-session-gnome\fR is a component of the X2go GNOME bindings. It is run if a user selects the ,,Unmount'' +action in the right-click context menu on X2go shared folder icons on the GNOME desktop. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/sbin/update-gnome-menu-x2go b/sbin/update-gnome-menu-x2go new file mode 100755 index 0000000..9d4de0f --- /dev/null +++ b/sbin/update-gnome-menu-x2go @@ -0,0 +1,72 @@ +#!/usr/bin/perl + +# 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) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +use strict; + +my $mode=shift; +if( $mode eq "--help" ) +{ + print "Usage: $0 [--remove]\n"; + print " Add or remove \"Suspend X2Go session\" button to gnome-settings menu \n"; + exit; +} +my $menu; +if ( -e "/etc/xdg/menus/gnome-settings.menu" ) +{ + $menu="/etc/xdg/menus/gnome-settings.menu"; +} +elsif ( -e "/etc/xdg/menus/settings.menu" ) +{ + $menu="/etc/xdg/menus/settings.menu"; +} +else +{ + die "Settings menu not found in /etc/xdg/menus"; +} + +my $menustr="<MergeFile>/etc/xdg/menus/gnome-settings-x2go.menu</MergeFile>\n"; + +open(FILE,"<$menu"); +my @ln=<FILE>; +close(FILE); +my $text=join("",@ln); + +if( $mode eq "--remove" ) +{ + if($text =~ m/$menustr/) + { + $text =~ s/\n$menustr//; + open(FILE,">$menu"); + print FILE $text; + close(FILE); + } +} +else +{ + if(! ($text =~ m/$menustr/)) + { + $text =~ s/<\/Layout>/<\/Layout>\n$menustr/; + open(FILE,">$menu"); + print FILE $text; + close(FILE); + } +} \ No newline at end of file diff --git a/share/applications/x2gonautilus.desktop b/share/applications/x2gonautilus.desktop index e0ad6fc..c653e6d 100644 --- a/share/applications/x2gonautilus.desktop +++ b/share/applications/x2gonautilus.desktop @@ -1,9 +1,10 @@ [Desktop Entry] Encoding=UTF-8 Name=x2gonautilus -MimeType=application/sshfsdisk;application/sshfscdrom;application/sshfsremovable +MimeType=application/sshfsdisk-x2go-gnome;application/sshfscdrom-x2go-gnome;application/sshfsremovable-x2go-gnome Exec=x2gonautilus %f Type=Application Terminal=false NoDisplay=true Icon=file-manager + diff --git a/share/applications/x2gosuspend.desktop b/share/applications/x2gosuspend.desktop index e6c22c1..65745e8 100644 --- a/share/applications/x2gosuspend.desktop +++ b/share/applications/x2gosuspend.desktop @@ -6,3 +6,5 @@ Icon=exit Exec=x2gosuspend-session-gnome Terminal=false Type=Application +Categories=GNOME;GTK;Network +OnlyShowIn=GNOME; diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg new file mode 120000 index 0000000..20f78dd --- /dev/null +++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg @@ -0,0 +1 @@ +/usr/share/icons/gnome-colors-common/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg deleted file mode 120000 index 92dbac8..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg new file mode 120000 index 0000000..3a2e8f9 --- /dev/null +++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg @@ -0,0 +1 @@ +/usr/share/icons/gnome-colors-common/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg deleted file mode 120000 index 388c35e..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg new file mode 120000 index 0000000..7ca88a1 --- /dev/null +++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg @@ -0,0 +1 @@ +/usr/share/icons/gnome-colors-common/scalable/devices/drive-removable-media.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg deleted file mode 120000 index ab47d4e..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome/scalable/devices/drive-removable-media.svg \ No newline at end of file diff --git a/share/mime/packages/sshfs.xml b/share/mime/packages/sshfs-x2go-gnome.xml similarity index 58% rename from share/mime/packages/sshfs.xml rename to share/mime/packages/sshfs-x2go-gnome.xml index fe04e48..506101e 100644 --- a/share/mime/packages/sshfs.xml +++ b/share/mime/packages/sshfs-x2go-gnome.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/sshfscdrom"> + <mime-type type="application/sshfscdrom-x2go-gnome"> <comment>SSHFS CDROM</comment> <comment xml:lang="de">SSHFS CDROM</comment> - <glob pattern="*(sshfs-cdrom)"/> + <glob pattern="* (sshfs-cdrom-gnome)"/> </mime-type> - <mime-type type="application/sshfsdisk"> + <mime-type type="application/sshfsdisk-x2go-gnome"> <comment>SSHFS Disk</comment> <comment xml:lang="de">SSHFS Freigabe</comment> - <glob pattern="*(sshfs-disk)"/> + <glob pattern="* (sshfs-disk-gnome)"/> </mime-type> - <mime-type type="application/sshfsremovable"> + <mime-type type="application/sshfsremovable-x2go-gnome"> <comment>SSHFS Removable</comment> <comment xml:lang="de">SSHFS Gerät</comment> - <glob pattern="*(sshfs-removable)"/> + <glob pattern="* (sshfs-removable-gnome)"/> </mime-type> </mime-info> diff --git a/suspend/x2gosuspend-session-gnome b/suspend/x2gosuspend-session-gnome deleted file mode 100755 index df57978..0000000 --- a/suspend/x2gosuspend-session-gnome +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -x2gosuspend-session $X2GO_SESSION diff --git a/updatemenu/gnome-settingsx2go.menu b/updatemenu/gnome-settingsx2go.menu deleted file mode 100644 index 93923d2..0000000 --- a/updatemenu/gnome-settingsx2go.menu +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE Menu -PUBLIC '-//freedesktop//DTD Menu 1.0//EN' -'http://standards.freedesktop.org/menu-spec/menu-1.0.dtd'> -<Menu> - <Name>Desktop</Name> - <Include> - <Filename>x2gosuspend.desktop</Filename> - </Include> - <Layout> - <Merge type="menus"/> - <Separator/> - <Filename>x2gosuspend.desktop</Filename> - <Merge type="files"/> - </Layout> -</Menu> - - - - \ No newline at end of file diff --git a/updatemenu/update-gnome-menu-x2go b/updatemenu/update-gnome-menu-x2go deleted file mode 100755 index d9e1619..0000000 --- a/updatemenu/update-gnome-menu-x2go +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/perl -use strict; - -my $mode=shift; -if( $mode eq "--help" ) -{ - print "Usage: $0 [--remove]\n"; - print " Add or remove \"Suspend X2Go session\" button to gnome-settings menu \n"; - exit; -} -my $menu; -if ( -e "/etc/xdg/menus/gnome-settings.menu" ) -{ - $menu="/etc/xdg/menus/gnome-settings.menu"; -} -elsif ( -e "/etc/xdg/menus/settings.menu" ) -{ - $menu="/etc/xdg/menus/settings.menu"; -} -else -{ - die "Settings menu not found in /etc/xdg/menus"; -} - -my $menustr="<MergeFile>/etc/xdg/menus/gnome-settingsx2go.menu</MergeFile>\n"; - -open(FILE,"<$menu"); -my @ln=<FILE>; -close(FILE); -my $text=join("",@ln); - -if( $mode eq "--remove" ) -{ - if($text =~ m/$menustr/) - { - $text =~ s/\n$menustr//; - open(FILE,">$menu"); - print FILE $text; - close(FILE); - } -} -else -{ - if(! ($text =~ m/$menustr/)) - { - $text =~ s/<\/Layout>/<\/Layout>\n$menustr/; - open(FILE,">$menu"); - print FILE $text; - close(FILE); - } -} \ No newline at end of file diff --git a/x2gonautilus/x2gonautilus b/x2gonautilus/x2gonautilus deleted file mode 100755 index 48f3c9e..0000000 --- a/x2gonautilus/x2gonautilus +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/perl -use strict; - -my $fname=shift; -open(F,"<$fname") or die "can't open $fname"; -my $dir=<F>; -close(F); -system( "nautilus $dir" ); diff --git a/xdg-menus/gnome-settings-x2go.menu b/xdg-menus/gnome-settings-x2go.menu new file mode 100644 index 0000000..0f7207c --- /dev/null +++ b/xdg-menus/gnome-settings-x2go.menu @@ -0,0 +1,13 @@ +<!DOCTYPE Menu PUBLIC '-//freedesktop//DTD Menu 1.0//EN' 'http://standards.freedesktop.org/menu-spec/menu-1.0.dtd'> +<Menu> + <Name>Desktop</Name> + <Include> + <Filename>x2gosuspend.desktop</Filename> + </Include> + <Layout> + <Merge type="menus"/> + <Separator/> + <Filename>x2gosuspend.desktop</Filename> + <Merge type="files"/> + </Layout> +</Menu> hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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" (X2go bindings for GNOME).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.1-31-g8227f81
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via 8227f81ad06cfafd26de1fded85d355c1fefd110 (commit) via 87e635cc4e85e3eedee6b1dcbfc6cd85ba341bff (commit) from 7b3fe1e047ea49a18ec2ff8d68a828e80d5009ea (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 8227f81ad06cfafd26de1fded85d355c1fefd110 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 11:31:33 2011 +0200 release 2.0.1.3, rework changelog commit 87e635cc4e85e3eedee6b1dcbfc6cd85ba341bff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 11:28:17 2011 +0200 version increment ----------------------------------------------------------------------- Summary of changes: VERSION.x2gognomebindings | 2 +- debian/changelog | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/VERSION.x2gognomebindings b/VERSION.x2gognomebindings index 7c831aa..f7e7717 100644 --- a/VERSION.x2gognomebindings +++ b/VERSION.x2gognomebindings @@ -1 +1 @@ -2.0.1.2 +2.0.1.3 diff --git a/debian/changelog b/debian/changelog index 13950a3..8a9f072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low +x2gognomebindings (2.0.1.3-0~x2go1) unstable; urgency=low * New upstream version (2.0.1.3): - - Move ,,x2goumount'' script into package as ,,x2goumount-session-gnome''. - - Move x2gosuspend-session-gnome to /bin folder within package. - - Add man apges for x2goumount-session-gnome, x2gosuspend-session-gnome. + - Move ,,x2goumount'' script into source project as ,,x2goumount-session-gnome''. + - Move x2gosuspend-session-gnome to /bin folder within source project. + - Add man pages for x2goumount-session-gnome, x2gosuspend-session-gnome. - Add simple man page for x2gonautilus. - Place x2go-suspend.desktop icon in GNOME Network submenu. - Define unique MIME name spaces for X2go SSHFS GNOME icons. @@ -15,14 +15,12 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low - Let x2goumount-session-gnome be able to handle icons with blanks in their name. * Add gnome-menus as dependency. - * Now fully use debhelper for packaging. Reduced linitian issues - nearly completely (still open: old-format-menu-file - /usr/share/menu/x2gognomebindings). + * Now fully use debhelper for packaging. Fixed lintian issues. * Use source format 3.0 (native). * Add linitian-overrides an man pages to package. * Depend on x2goserver (>=3.0.99.6). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 24 Sep 2011 03:06:58 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:30:51 +0200 x2gognomebindings (2.0.1.2-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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" (X2go bindings for GNOME).

1 0

nx-x11.git - master (branch) created: 80ba46ddaa9769ae0008ea3a791239764235c305
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been created at 80ba46ddaa9769ae0008ea3a791239764235c305 (commit) - Log ----------------------------------------------------------------- commit 80ba46ddaa9769ae0008ea3a791239764235c305 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 6 11:35:57 2011 +0200 fix distclean in Makefile for running dpkg-buildpackage commit 9b4183f4607acbc62afc7245efd0a4aa6381981d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 6 11:35:30 2011 +0200 use xmakefile from current x2goagent project commit 1aea35966cd140f5b5198164d7e1bebf78d288a8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 6 11:34:29 2011 +0200 add /debian folder to project commit 161d3bc32b8d6929280a4b5f4f189ae415033ca9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 6 09:48:24 2011 +0200 Imported nx-X11 3.5.0-2 from NoMachine upstream commit bfecc88e8176338c0c486b3f4f407ece39409bdc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 6 09:45:25 2011 +0200 start nx-X11 project ----------------------------------------------------------------------- hooks/post-receive -- nx-x11.git (nx-x11 upstream project) 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 "nx-x11.git" (nx-x11 upstream project).

1 0

x2godesktopsharing.git - build-main (branch) updated: 3.0.1.3
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, build-main has been updated via 0d8c6ada8efc63d78d114cd49cff08cbe281257e (commit) via f1c63f7ce96103df55065dd2eccd399ef62e865f (commit) via 0d4198a2a0e28e1984995ad8b60c132303d61c61 (commit) via 65513d1ac3a1d04eb168d14745edd49e2927f737 (commit) via d7dfa95bf6f99174a9a88adae3b3de68b57aa7d8 (commit) via a9be575d798f9cf7674f232becd9abddc63ec0ab (commit) via 090e7aff4281c5fa3bbc441962bbdc6056cb73c8 (commit) via dc2af16a85f83b4b1ebe9ce9079d6f00c8ab5c3e (commit) via 7d7533aa07b347e105a6b02557d7732183579a48 (commit) via 4802e527534545c7ecb17d977d193e5cc246d57d (commit) via caf8fd6bfb2f094a64effac706a7cb0202c2124b (commit) via 0d49dfdde6ee62e21c709de027a6f80576d88727 (commit) via ae952c3ad02ebd5231b425cfcc13c8a6515c01d8 (commit) via afbd6ea63298d948d3543143e13ed12db7b3fddd (commit) via 10d8ce59c44d6fdc17ff4823efb307a36cbfa79d (commit) via d1674883c091c3a532011a31bb2c17d35cb7b725 (commit) via 91df9e9278ea7dcb4bc17d1f8a934af0dfdd909d (commit) via 3c4601b7ec0af5717bdd9e6983e451efd1c4b67f (commit) via 0720d15908712b9f3c3390e46515bdd3fcd8b550 (commit) via cf356157e83da59220ab7af3c8bb71f722b3e754 (commit) via 619fa9d40858791b1bf98754ed110c606c634005 (commit) via a17eb04222eac5aee009924f004df2ad6342eb34 (commit) via 37b57f64cab0f715aae80056a5c0053eafb3390d (commit) via 05b2d0b00809da05a1e9f30ea4b1fdb71612a861 (commit) via 3f8822957798a3b61415f9bf358fd08266144854 (commit) via e9168f26a14d6d2c5215285966a534b73b974118 (commit) via 4b8c2abb58aa34828aed15d5d7b336a785ca8bc9 (commit) via 91e0971284d686e42f444e312cf3220ea22ea6f9 (commit) via 4cf4a0b2dad35e92ddaac712c9d2b6f513cd4a46 (commit) via ecfddd98ebfd7f844942ebba155240ba7a388e22 (commit) via b84f97efa59e4643b32927f752332ad30a98c160 (commit) via 68851b594c736924659ee40696317b8c0bc9c27d (commit) via 308d4207bf44963ce7c31984531d175b238de42d (commit) via 80ba9339306dd2c7283be72389dca892df4bf85d (commit) from 8aaf4bd12b80f30767983f299c9581d5d73916c0 (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: Doxyfile | 6 +- VERSION | 1 - VERSION.x2godesktopsharing | 1 + bin/x2goresume-desktopsharing | 39 + bin/x2gosuspend-desktopsharing | 34 + bin/x2goterminate-desktopsharing | 46 ++ debian/changelog | 23 + debian/control | 7 +- debian/rules | 2 +- debian/x2godesktopsharing.dirs | 12 +- debian/x2godesktopsharing.install | 3 + debian/x2godesktopsharing.manpages | 3 +- debian/x2godesktopsharing.postinst | 4 +- main.cpp | 215 ++++--- man/{ => man1}/x2godesktopsharing.1 | 6 +- man/man8/x2goresume-desktopsharing.8 | 28 + man/man8/x2gosuspend-desktopsharing.8 | 37 + man/man8/x2goterminate-desktopsharing.8 | 30 + share/x2gofeature.d/x2godesktopsharing.features | 36 + sharetray.cpp | 871 +++++++++++++---------- sharetray.h | 111 ++-- 21 files changed, 980 insertions(+), 535 deletions(-) delete mode 100644 VERSION create mode 100644 VERSION.x2godesktopsharing create mode 100755 bin/x2goresume-desktopsharing create mode 100755 bin/x2gosuspend-desktopsharing create mode 100755 bin/x2goterminate-desktopsharing create mode 100644 debian/x2godesktopsharing.install rename man/{ => man1}/x2godesktopsharing.1 (77%) create mode 100644 man/man8/x2goresume-desktopsharing.8 create mode 100644 man/man8/x2gosuspend-desktopsharing.8 create mode 100644 man/man8/x2goterminate-desktopsharing.8 create mode 100755 share/x2gofeature.d/x2godesktopsharing.features The diff of changes is: diff --git a/Doxyfile b/Doxyfile index 03042a9..fc8159f 100644 --- a/Doxyfile +++ b/Doxyfile @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = x2godesktopshare +PROJECT_NAME = x2godesktopsharing PROJECT_NUMBER = 1 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO @@ -93,7 +93,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = /usr/src.cur/db-builds/x2godesktopshare/x2godesktopshare-3.0.1 +INPUT = /usr/src.cur/db-builds/x2godesktopsharing/x2godesktopsharing-3.0.1.3 INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.cc \ @@ -272,7 +272,7 @@ SKIP_FUNCTION_MACROS = YES # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = -GENERATE_TAGFILE = x2godesktopshare.tag +GENERATE_TAGFILE = x2godesktopsharing.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl diff --git a/VERSION b/VERSION deleted file mode 100644 index cd0a3b6..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.1.2 diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing new file mode 100644 index 0000000..e9aef23 --- /dev/null +++ b/VERSION.x2godesktopsharing @@ -0,0 +1 @@ +3.0.1.3 diff --git a/bin/x2goresume-desktopsharing b/bin/x2goresume-desktopsharing new file mode 100755 index 0000000..aaa2c25 --- /dev/null +++ b/bin/x2goresume-desktopsharing @@ -0,0 +1,39 @@ +#!/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> +# Copyright (C) 2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + +if [ $# -eq 1 ]; then + SESSION_NAME=$1 +else + SESSION_NAME=$X2GO_SESSION +fi + +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + +X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) + +test -e $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing && { + rm -f $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing + DISPLAY=:$X2GO_DISPLAY.0 x2godesktopsharing &>/dev/null & +} diff --git a/bin/x2gosuspend-desktopsharing b/bin/x2gosuspend-desktopsharing new file mode 100755 index 0000000..676cab1 --- /dev/null +++ b/bin/x2gosuspend-desktopsharing @@ -0,0 +1,34 @@ +#!/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> +# Copyright (C) 2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + +if [ $# -eq 1 ]; then + SESSION_NAME=$1 +else + SESSION_NAME=$X2GO_SESSION +fi + +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + +x2goterminate-desktopsharing $SESSION_NAME && touch $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing diff --git a/bin/x2goterminate-desktopsharing b/bin/x2goterminate-desktopsharing new file mode 100755 index 0000000..bbf7675 --- /dev/null +++ b/bin/x2goterminate-desktopsharing @@ -0,0 +1,46 @@ +#!/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> +# Copyright (C) 2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + +if [ $# -eq 1 ]; then + SESSION_NAME=$1 +else + SESSION_NAME=$X2GO_SESSION +fi + +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + + +X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) +for process_id in `pidof x2godesktopsharing`; do + env_of_process=$(cat -A /proc/$process_id/environ) + env_of_process=${env_of_process//^@/\\n} + display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2) + if echo $display | grep ":$X2GO_DISPLAY" &>/dev/null; then + kill -SIGTERM $process_id + exit 0 + fi +done + +exit -1 diff --git a/debian/changelog b/debian/changelog index c4bd217..97f169f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +x2godesktopsharing (3.0.1.3-0~x2go1) unstable; urgency=low + + * New upstream version (3.0.1.3): + - Fix incomplete DENY statement in main.cpp. + - System group for x2godesktopsharing changed from x2gousers -> + x2godesktopsharing. + - Differentiate between local and remote user, fixes display of wrong + user name for remote user. + - Add signal handler so that unix signals can be handled within Qt. + - Add script x2godesktopsharing-terminate: detect x2godesktopsharing process + of a given session and terminate that process. + - Save settings and tidy up lock and socket file on X-Server crash. + - Provide feature for suspending/resuming x2godesktopsharing + (x2godesktopsharing will be terminated on x2gosuspend-session and + operations will be resumed on x2goresume-session). + - Add man pages for x2go<action>-desktopsharing commands, re-arrange man + page folders in source project. + * Depend on x2goserver (>=3.0.99.6). + * Make sure postinst script does not fail when checking for existence + of group x2godesktopsharing. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:17:38 +0200 + x2godesktopsharing (3.0.1.2-0~x2go1) unstable; urgency=low * change of version numbering scheme diff --git a/debian/control b/debian/control index 7c7b9c3..94119f0 100644 --- a/debian/control +++ b/debian/control @@ -6,14 +6,17 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: debhelper (>= 7), libqt4-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 +Homepage: http://code.x2go.org/releases/source/x2godesktopsharing +Vcs-Git: git://code.x2go.org/x2godesktopsharing.git +Vcs-Browser: http://code.x2go.org/gitweb?p=x2godesktopsharing.git;a=summary Package: x2godesktopsharing Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - x2goserver (>= 3.0.99), + x2goserver (>= 3.0.99.6-0~), libqt4-gui, Recommends: Description: share X2go desktops with other users (via shadow sessions) diff --git a/debian/rules b/debian/rules index 57f35f4..6add866 100755 --- a/debian/rules +++ b/debian/rules @@ -78,7 +78,7 @@ binary-arch: build install dh_installchangelogs dh_installdocs dh_installexamples -# dh_install + dh_install dh_installmenu # dh_installdebconf # dh_installlogrotate diff --git a/debian/x2godesktopsharing.dirs b/debian/x2godesktopsharing.dirs index bd2db4c..7e4dcd7 100644 --- a/debian/x2godesktopsharing.dirs +++ b/debian/x2godesktopsharing.dirs @@ -1,8 +1,10 @@ usr/bin -usr/share/applications/ +usr/share/applications usr/share/x2godesktopsharing usr/share/x2godesktopsharing/icons -usr/share/icons/hicolor/128x128/apps/ -usr/share/icons/hicolor/16x16/apps/ -usr/share/icons/hicolor/64x64/apps/ -usr/share/icons/hicolor/32x32/apps/ +usr/share/icons/hicolor/128x128/apps +usr/share/icons/hicolor/16x16/apps +usr/share/icons/hicolor/64x64/apps +usr/share/icons/hicolor/32x32/apps +usr/share/x2go +usr/share/x2go/versions diff --git a/debian/x2godesktopsharing.install b/debian/x2godesktopsharing.install new file mode 100644 index 0000000..1e51109 --- /dev/null +++ b/debian/x2godesktopsharing.install @@ -0,0 +1,3 @@ +VERSION.x2godesktopsharing usr/share/x2go/versions +bin/* usr/bin/ +share/* usr/share/x2go/ \ No newline at end of file diff --git a/debian/x2godesktopsharing.manpages b/debian/x2godesktopsharing.manpages index 7aee1a9..ad46900 100644 --- a/debian/x2godesktopsharing.manpages +++ b/debian/x2godesktopsharing.manpages @@ -1 +1,2 @@ -man/x2godesktopsharing.1 \ No newline at end of file +man/man1/x2godesktopsharing.1 +man/man8/x2go*-desktopsharing.8 diff --git a/debian/x2godesktopsharing.postinst b/debian/x2godesktopsharing.postinst index 2f7b721..6fd8a1a 100755 --- a/debian/x2godesktopsharing.postinst +++ b/debian/x2godesktopsharing.postinst @@ -22,10 +22,10 @@ set -e case "$1" in configure) - X2GOGRP=`getent group | grep x2gousers` + X2GOGRP=`getent group | grep x2godesktopsharing || true` if [ "x$X2GOGRP"="x" ] then - addgroup --system x2gousers + addgroup --system x2godesktopsharing fi ;; diff --git a/main.cpp b/main.cpp index 636c43c..d3733b5 100644 --- a/main.cpp +++ b/main.cpp @@ -26,102 +26,141 @@ #include <QLocalSocket> #include <iostream> #include <QDir> - +#include <csignal> using namespace std; void client ( const QStringList & cmd ) { - if ( cmd.size() !=10 ) - { - cerr<<"wrong parameters"<<endl; - cout<<"DEN"; - return; - } - QStringList params=cmd[9].split ( "XSHAD" ); - if ( params.size() !=3 ) - { - cerr<<"wrong parameters"<<endl; - cout<<"DEN"; - return; - } - - cerr<<"starting x2godesktopsharing in client mode, cmd: "<< - cmd.join(" ").toAscii().data() <<std::endl; - - QString dispname=params[2]; - QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ - params[1]+"@"+dispname; - QLocalSocket sock; - sock.connectToServer ( socketName ); - if ( !sock.waitForConnected ( 3000 ) ) - { - QString message="Unable to connect: " +socketName; - cout<<"DEN"; - cerr<<message.toAscii().data() <<endl; - return; - } - sock.write ( cmd.join(" ").toAscii().data(),cmd.join(" ").toAscii().length() ); - if ( !sock.waitForReadyRead() ) - { - cout<<"DEN"; - cerr<<"Cannot write to socket: "<<socketName.toAscii().data() <<endl; - return;; - } - char buffer[256]; - int read=sock.read ( buffer,255 ); - if ( read<=0 ) - { - cout<<"DEN"; - cerr<<"Cannot read from socket: " <<socketName.toAscii().data() <<endl; - return; - } - buffer[read]=0; - cout<<buffer<<endl; + if ( cmd.size() !=11 ) + { + cerr<<"wrong parameters"<<endl; + cout<<"DENY"; + return; + } + QStringList params=cmd[9].split ( "XSHAD" ); + if ( params.size() !=3 ) + { + cerr<<"wrong parameters"<<endl; + cout<<"DENY"; + return; + } + + cerr<<"starting x2godesktopsharing in client mode, cmd: "<< + cmd.join(" ").toAscii().data() <<std::endl; + + QString dispname=params[2]; + QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ + params[1]+"@"+dispname; + QLocalSocket sock; + sock.connectToServer ( socketName ); + if ( !sock.waitForConnected ( 3000 ) ) + { + QString message="Unable to connect: " +socketName; + cout<<"DENY"; + cerr<<message.toAscii().data() <<endl; + return; + } + sock.write ( cmd.join(" ").toAscii().data(),cmd.join(" ").toAscii().length() ); + if ( !sock.waitForReadyRead() ) + { + cout<<"DENY"; + cerr<<"Cannot write to socket: "<<socketName.toAscii().data() <<endl; + return;; + } + char buffer[256]; + int read=sock.read ( buffer,255 ); + if ( read<=0 ) + { + cout<<"DENY"; + cerr<<"Cannot read from socket: " <<socketName.toAscii().data() <<endl; + return; + } + buffer[read]=0; + cout<<buffer<<endl; +} + +static int setup_unix_signal_handlers() +{ + struct sigaction keybint, term, abort, hup; + + keybint.sa_handler = ShareTray::keybintSignalHandler; + sigemptyset(&keybint.sa_mask); + keybint.sa_flags = 0; + keybint.sa_flags |= SA_RESTART; + + if (sigaction(SIGINT, &keybint, 0) > 0) + return 1; + + term.sa_handler = ShareTray::termSignalHandler; + sigemptyset(&term.sa_mask); + term.sa_flags |= SA_RESTART; + + if (sigaction(SIGTERM, &term, 0) > 0) + return 2; + + abort.sa_handler = ShareTray::abortSignalHandler; + sigemptyset(&abort.sa_mask); + abort.sa_flags |= SA_RESTART; + + if (sigaction(SIGABRT, &abort, 0) > 0) + return 3; + + hup.sa_handler = ShareTray::hupSignalHandler; + sigemptyset(&hup.sa_mask); + hup.sa_flags |= SA_RESTART; + + if (sigaction(SIGHUP, &hup, 0) > 0) + return 4; + + return 0; } int main ( int argc, char *argv[] ) { - if ( argc>2 ) - { - QString par=argv[1]; - if ( par == "client" ) - { - QStringList cmdl; - for ( int i=2; i<argc;++i ) - cmdl<<argv[i]; - client ( cmdl ); - return 0; - } - } - - QApplication app ( argc,argv ); - QTranslator translator; - QString filename=QString ( ":/x2godesktopsharing_%1" ).arg ( - QLocale::system().name() ); - filename=filename.toLower(); - if ( !translator.load ( filename ) ) - { - qDebug ( "Can't load translator (%s) !\n", - filename.toLocal8Bit().data() ); - } - else - app.installTranslator ( &translator ); - - - QTranslator qtTranslator; - filename=QString ( ":/qt_%1" ).arg ( QLocale::system().name() ); - if ( !qtTranslator.load ( filename ) ) - { - qDebug ( "Can't load translator (%s) !\n", - filename.toLocal8Bit().data() ); - } - else - app.installTranslator ( &qtTranslator ); - ShareTray* tray=new ShareTray; - tray->hide(); - - - return app.exec(); + if ( argc>2 ) + { + QString par=argv[1]; + if ( par == "client" ) + { + QStringList cmdl; + for ( int i=2; i<argc;++i ) + cmdl<<argv[i]; + client ( cmdl ); + return 0; + } + } + + QApplication app ( argc,argv ); + QTranslator translator; + QString filename=QString ( ":/x2godesktopsharing_%1" ).arg ( + QLocale::system().name() ); + filename=filename.toLower(); + if ( !translator.load ( filename ) ) + { + qDebug ( "Can't load translator (%s) !\n", + filename.toLocal8Bit().data() ); + } + else + app.installTranslator ( &translator ); + + QTranslator qtTranslator; + filename=QString ( ":/qt_%1" ).arg ( QLocale::system().name() ); + if ( !qtTranslator.load ( filename ) ) + { + qDebug ( "Can't load translator (%s) !\n", + filename.toLocal8Bit().data() ); + } + else + app.installTranslator ( &qtTranslator ); + + ShareTray* tray=new ShareTray; + tray->hide(); + setup_unix_signal_handlers(); + try { + return app.exec(); + } catch (const std::bad_alloc &) { + tray->slotMenuClose(); + } } diff --git a/man/x2godesktopsharing.1 b/man/man1/x2godesktopsharing.1 similarity index 77% rename from man/x2godesktopsharing.1 rename to man/man1/x2godesktopsharing.1 index 2fba34c..eb154a1 100644 --- a/man/x2godesktopsharing.1 +++ b/man/man1/x2godesktopsharing.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godesktopsharing 1 "14 Apr 2011" "Version 3.0.1.2" "X2go Application" +.TH x2godesktopsharing 1 "14 Apr 2011" "Version 3.0.1.x" "X2go Application" .SH NAME x2godesktopsharing \- Share an X2go desktop with other clients and users. .SH SYNOPSIS @@ -15,8 +15,8 @@ x2godesktopsharing \- Share an X2go desktop with other clients and users. \fBx2godesktopsharing\fR .SH DESCRIPTION -\fBx2godesktopsharing\fR is a system tray tool that allows a user to control access his/her X2go -session (via shadow sessions). +\fBx2godesktopsharing\fR is a system tray tool that allows a user to give/control access to his/her X/X2go +session (via shadow session support in NX libraries). .PP .SH OPTIONS \fBx2godesktopsharing\fR has no known options. diff --git a/man/man8/x2goresume-desktopsharing.8 b/man/man8/x2goresume-desktopsharing.8 new file mode 100644 index 0000000..dc6fd28 --- /dev/null +++ b/man/man8/x2goresume-desktopsharing.8 @@ -0,0 +1,28 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goresume-desktopsharing 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goresume-desktopsharing \- Resume Desktop Sharing Applet for a given X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2goresume-desktopsharing <session_id> + +.SH DESCRIPTION +\fBx2goresume-desktopsharing\fR launches the \fBx2godesktopsharing\fR applet for X2go session <session_id>. +.PP +\fBx2goresume-desktopsharing\fR is run with normal user privileges and it is used from within X2go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2goresume-desktopsharing\fR always returns 0. +.SH SEE ALSO +x2godesktopsharing(1), x2goresume-session(8), x2gosuspend-desktopsharing(8), x2goterminate-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/man/man8/x2gosuspend-desktopsharing.8 b/man/man8/x2gosuspend-desktopsharing.8 new file mode 100644 index 0000000..6f7b6b4 --- /dev/null +++ b/man/man8/x2gosuspend-desktopsharing.8 @@ -0,0 +1,37 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gosuspend-desktopsharing 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2gosuspend-desktopsharing \- Suspend Desktop Sharing for a given X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosuspend-desktopsharing <session_id> + +.SH DESCRIPTION +\fBx2gosuspend-desktopsharing\fR executes \fBx2goterminate-desktopsharing\fR and places a reminder file +.PP + ,,resume-desktopsharing'' +.PP +into +.PP + $HOME/.x2go/C-<session_id>/ +.PP +so that \fBx2godesktopsharing\fR can be resumed +on session resume. +.PP +\fBx2gosuspend-desktopsharing\fR is run with normal user privileges and it is used from within X2go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2gosuspend-desktopsharing\fR always returns 0. +.SH SEE ALSO +x2godesktopsharing(1), x2gosuspend-session(8), x2goterminate-desktopsharing(8), x2goresume-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/man/man8/x2goterminate-desktopsharing.8 b/man/man8/x2goterminate-desktopsharing.8 new file mode 100644 index 0000000..b970b16 --- /dev/null +++ b/man/man8/x2goterminate-desktopsharing.8 @@ -0,0 +1,30 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goterminate-desktopsharing 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goterminate-desktopsharing \- Cleanly Terminate Desktop Sharing for a given X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2goterminate-desktopsharing <session_id> + +.SH DESCRIPTION +\fBx2goterminate-desktopsharing\fR allows to detect a running and associated \fBx2godesktopsharing\fR +applet and to cleanly terminate this applet. +.PP +\fBx2goterminate-desktopsharing\fR is run with normal user privileges and it is used from within X2go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2goterminate-desktopsharing\fR returns 0 if a \fBx2godesktopsharing\fR process could be identified +and terminated. If not, the exit code is -1. +.SH SEE ALSO +x2godesktopsharing(1), x2goteminate-session(8), x2gosuspend-desktopsharing(8), x2goresume-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/share/x2gofeature.d/x2godesktopsharing.features b/share/x2gofeature.d/x2godesktopsharing.features new file mode 100755 index 0000000..2f29612 --- /dev/null +++ b/share/x2gofeature.d/x2godesktopsharing.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_DESKTOPSHARING") echo "ok"; exit 0;; + *) exit -1;; + +esac + diff --git a/sharetray.cpp b/sharetray.cpp index 541b50c..2bf7dee 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -17,10 +17,12 @@ #include <QDir> #include <QtDebug> #include <QMessageBox> +#include <QSocketNotifier> +#include <sys/socket.h> #include "simplelocalsocket.h" #include "accessaction.h" #include <sys/types.h> -#include <signal.h> +#include <csignal> #include <errno.h> #include <QToolTip> #include <QTimer> @@ -33,520 +35,619 @@ #include <QProcess> #define STAT_ACT_COUNT 10 -#define VERSION "3.0.1-1" +#define VERSION "3.0.1.3" + +//needed to not get an undefined reference to static members +int ShareTray::sigkeybintFd[2]; +int ShareTray::sigtermFd[2]; +int ShareTray::sigabortFd[2]; +int ShareTray::sighupFd[2]; ShareTray::ShareTray() : QMainWindow() { - serverSocket=0l; - menuClose=false; - current_list=BLACK; - - ui.setupUi ( this ); - ui.box->setSelectionMode ( QAbstractItemView::ExtendedSelection ); - - connect ( ui.close_box,SIGNAL ( clicked ( QAbstractButton* ) ), - SLOT ( slotMsgClose ( QAbstractButton* ) ) ); - - connect ( ui.ok_cancel_box,SIGNAL ( clicked ( QAbstractButton* ) ), - SLOT ( slotMsgOkCancel ( QAbstractButton* ) ) ); - - connect ( ui.del,SIGNAL ( clicked() ), - SLOT ( slotDelListItem() ) ); - - ui.icon->setPixmap ( QPixmap ( ":icons/128x128/x2godesktopsharing.png" ) ); - - ui.text->setText ( tr ( "<b>X2GO DesktopSharing V. " ) +VERSION+ - " </b >(Qt - "+qVersion() +")"+ - ui.text->text() ); - - setWindowFlags ( Qt::Dialog ); - Qt::WindowFlags flags=windowFlags(); - flags&= ~Qt::WindowTitleHint; - setWindowFlags ( flags ); - - QString dispname=getenv ( "DISPLAY" ); - socketFname=QDir::tempPath() +"/x2godesktopsharing_@"+ - getenv ( "LOGNAME" ) +"@"+dispname; - lockFname=QDir::tempPath() +"/x2godesktopsharing.lock_"+ - getenv ( "LOGNAME" ) +"@"+dispname; - if ( QFile::exists ( lockFname ) ) - { - QFile file ( lockFname ); - if ( file.open ( QIODevice::ReadOnly | QIODevice::Text ) ) - { - QTextStream in ( &file ); - if ( !in.atEnd() ) - { - QString line = in.readLine(); - file.close(); - if ( abs ( line.toUInt() - - QDateTime::currentDateTime().toTime_t() ) <5 ) - { - - QString message=QString ( - tr ( - "X2Go desktop sharing application " - "is already active for this " - "display \n" - "if this application is no longer " - "running, remove %1\n" - "and start again" ) ).arg ( lockFname ); - QMessageBox::critical ( 0l,tr ( - "Error" ),message, - QMessageBox::Ok, - QMessageBox::NoButton ); - exit ( -1 ); - } - } - } - QFile::remove ( lockFname ); - } - if ( QFile::exists ( socketFname ) ) - QFile::remove ( socketFname ); - - QTimer *lockTimer = new QTimer ( this ); - connect ( lockTimer, SIGNAL ( timeout() ), this, SLOT ( slotUpdateLockFile() ) ); - lockTimer->start ( 3000 ); - trayIcon=new QSystemTrayIcon ( this ); - setWindowIcon ( QIcon ( ":icons/22x22/x2godesktopsharing.png" ) ); - menu = new QMenu ( this ); - trayIcon->setContextMenu ( menu ); - trayIcon->setToolTip ( tr ( "X2Go desktop sharing application" ) ); - - menu->addSeparator(); - - actWhite = menu->addAction ( QIcon ( ":icons/32x32/wlist.png" ) , - tr ( "Granted users..." ) ); - actBlack = menu->addAction ( QIcon ( ":icons/32x32/blist.png" ) , - tr ( "Banned users..." ) ); - menu->addSeparator(); - - actStart = menu->addAction ( QIcon ( ":icons/32x32/share.png" ) , - tr ( "Activate desktop sharing" ) ); - - actStop = menu->addAction ( QIcon ( ":icons/32x32/stop.png" ) , - tr ( "Deactivate desktop sharing" ) ); - - menu->addSeparator(); - QAction* actAbout=menu->addAction ( - QIcon ( ":icons/32x32/x2godesktopsharing.png" ), - tr ( "About X2GO Sharing" ) ); -// -// QAction* actAboutQt=menu->addAction( -// tr("About Qt")); -// connect ( actAboutQt,SIGNAL ( triggered ( bool ) ),this, -// SLOT ( slotAboutQt() ) ); -// - connect ( actAbout,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotAbout() ) ); + serverSocket=0l; + menuClose=false; + current_list=BLACK; + + ui.setupUi ( this ); + ui.box->setSelectionMode ( QAbstractItemView::ExtendedSelection ); + + connect ( ui.close_box,SIGNAL ( clicked ( QAbstractButton* ) ), + SLOT ( slotMsgClose ( QAbstractButton* ) ) ); + + connect ( ui.ok_cancel_box,SIGNAL ( clicked ( QAbstractButton* ) ), + SLOT ( slotMsgOkCancel ( QAbstractButton* ) ) ); + + connect ( ui.del,SIGNAL ( clicked() ), + SLOT ( slotDelListItem() ) ); + + ui.icon->setPixmap ( QPixmap ( ":icons/128x128/x2godesktopsharing.png" ) ); + + ui.text->setText ( tr ( "<b>X2GO DesktopSharing v" ) +VERSION+ + " </b >(Qt - "+qVersion() +")"+ + ui.text->text() ); + + setWindowFlags ( Qt::Dialog ); + Qt::WindowFlags flags=windowFlags(); + flags&= ~Qt::WindowTitleHint; + setWindowFlags ( flags ); + + QString dispname=getenv ( "DISPLAY" ); + socketFname=QDir::tempPath() +"/x2godesktopsharing_@"+ + getenv ( "LOGNAME" ) +"@"+dispname; + lockFname=QDir::tempPath() +"/x2godesktopsharing.lock_"+ + getenv ( "LOGNAME" ) +"@"+dispname; + if ( QFile::exists ( lockFname ) ) + { + QFile file ( lockFname ); + if ( file.open ( QIODevice::ReadOnly | QIODevice::Text ) ) + { + QTextStream in ( &file ); + if ( !in.atEnd() ) + { + QString line = in.readLine(); + file.close(); + if ( abs ( line.toUInt() - + QDateTime::currentDateTime().toTime_t() ) <5 ) + { + + QString message=QString ( + tr ( + "X2Go desktop sharing application " + "is already active for this " + "display \n" + "if this application is no longer " + "running, remove %1\n" + "and start again" ) ).arg ( lockFname ); + QMessageBox::critical ( 0l,tr ( + "Error" ),message, + QMessageBox::Ok, + QMessageBox::NoButton ); + exit ( -1 ); + } + } + } + QFile::remove ( lockFname ); + } + if ( QFile::exists ( socketFname ) ) + QFile::remove ( socketFname ); + + QTimer *lockTimer = new QTimer ( this ); + connect ( lockTimer, SIGNAL ( timeout() ), this, SLOT ( slotUpdateLockFile() ) ); + lockTimer->start ( 3000 ); + trayIcon=new QSystemTrayIcon ( this ); + setWindowIcon ( QIcon ( ":icons/22x22/x2godesktopsharing.png" ) ); + menu = new QMenu ( this ); + trayIcon->setContextMenu ( menu ); + trayIcon->setToolTip ( tr ( "X2Go desktop sharing application" ) ); + + menu->addSeparator(); + + actWhite = menu->addAction ( QIcon ( ":icons/32x32/wlist.png" ) , + tr ( "Granted users..." ) ); + actBlack = menu->addAction ( QIcon ( ":icons/32x32/blist.png" ) , + tr ( "Banned users..." ) ); + menu->addSeparator(); + + actStart = menu->addAction ( QIcon ( ":icons/32x32/share.png" ) , + tr ( "Activate desktop sharing" ) ); + + actStop = menu->addAction ( QIcon ( ":icons/32x32/stop.png" ) , + tr ( "Deactivate desktop sharing" ) ); + + menu->addSeparator(); + QAction* actAbout=menu->addAction ( + QIcon ( ":icons/32x32/x2godesktopsharing.png" ), + tr ( "About X2GO Sharing" ) ); + // + // QAction* actAboutQt=menu->addAction( + // tr("About Qt")); + // connect ( actAboutQt,SIGNAL ( triggered ( bool ) ),this, + // SLOT ( slotAboutQt() ) ); + // + connect ( actAbout,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotAbout() ) ); + + + menu->addSeparator(); + QAction* actExit = menu->addAction ( QIcon ( ":icons/32x32/exit.png" ) , + tr ( "&Quit" ) ); + + connect ( actWhite,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotWhiteList() ) ); + connect ( actBlack,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotBlackList() ) ); + + connect ( actExit,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotMenuClose() ) ); + + connect ( actStart,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotStartSharing() ) ); + + connect ( actStop,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotStopSharing() ) ); + + + + actStop->setEnabled ( false ); + + // unix signals (TERM, INT) are piped into a unix socket and will raise Qt events + if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigkeybintFd)) + qFatal("Couldn't create keyboard INT socketpair"); + + if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd)) + qFatal("Couldn't create TERM socketpair"); + + if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigabortFd)) + qFatal("Couldn't create ABRT socketpair"); + + if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sighupFd)) + qFatal("Couldn't create HANGUP socketpair"); + + snKeybInt = new QSocketNotifier(sigkeybintFd[1], QSocketNotifier::Read, this); + connect(snKeybInt, SIGNAL(activated(int)), this, SLOT(handleSigKeybInt())); + snTerm = new QSocketNotifier(sigtermFd[1], QSocketNotifier::Read, this); + connect(snTerm, SIGNAL(activated(int)), this, SLOT(handleSigTerm())); + snAbort = new QSocketNotifier(sigabortFd[1], QSocketNotifier::Read, this); + connect(snAbort, SIGNAL(activated(int)), this, SLOT(handleSigAbort())); + snHup = new QSocketNotifier(sighupFd[1], QSocketNotifier::Read, this); + connect(snHup, SIGNAL(activated(int)), this, SLOT(handleSigHup())); + + QTimer *timer = new QTimer ( this ); + connect ( timer, SIGNAL ( timeout() ), this, SLOT ( slotTimer() ) ); + timer->start ( 5000 ); + loadSettings(); + setTrayIcon(); + trayIcon->show(); +} - menu->addSeparator(); - QAction* actExit = menu->addAction ( QIcon ( ":icons/32x32/exit.png" ) , - tr ( "&Quit" ) ); +ShareTray::~ShareTray() +{ + qDebug() <<"stopping desktop sharing"; + slotStopSharing(); + if ( QFile::exists ( lockFname ) ) + QFile::remove ( lockFname ); + qDebug() <<"lock file removed"; + saveSettings(); + qDebug() <<"settings saved"; +} - connect ( actWhite,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotWhiteList() ) ); - connect ( actBlack,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotBlackList() ) ); +void ShareTray::handleSigKeybInt() +{ + snKeybInt->setEnabled(false); + char tmp; + ::read(sigkeybintFd[1], &tmp, sizeof(tmp)); + // do Qt stuff here + slotMenuClose(); - connect ( actExit,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotMenuClose() ) ); + snKeybInt->setEnabled(true); +} - connect ( actStart,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotStartSharing() ) ); +void ShareTray::handleSigTerm() +{ + snTerm->setEnabled(false); + char tmp; + ::read(sigtermFd[1], &tmp, sizeof(tmp)); - connect ( actStop,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotStopSharing() ) ); + // do Qt stuff here + slotMenuClose(); + snTerm->setEnabled(true); +} +void ShareTray::handleSigAbort() +{ + snAbort->setEnabled(false); + char tmp; + ::read(sigabortFd[1], &tmp, sizeof(tmp)); - actStop->setEnabled ( false ); + // do Qt stuff here + slotMenuClose(); - QTimer *timer = new QTimer ( this ); - connect ( timer, SIGNAL ( timeout() ), this, SLOT ( slotTimer() ) ); - timer->start ( 5000 ); - loadSettings(); - setTrayIcon(); - trayIcon->show(); + snAbort->setEnabled(true); } +void ShareTray::handleSigHup() +{ + snHup->setEnabled(false); + char tmp; + ::read(sighupFd[1], &tmp, sizeof(tmp)); -ShareTray::~ShareTray() + // do Qt stuff here + slotMenuClose(); + + snHup->setEnabled(true); +} + +void ShareTray::keybintSignalHandler(int) +{ + char a = 1; + ::write(sigkeybintFd[0], &a, sizeof(a)); +} + +void ShareTray::termSignalHandler(int) { - slotStopSharing(); - if ( QFile::exists ( lockFname ) ) - QFile::remove ( lockFname ); - saveSettings(); + char a = 1; + ::write(sigtermFd[0], &a, sizeof(a)); } +void ShareTray::abortSignalHandler(int) +{ + char a = 1; + ::write(sigabortFd[0], &a, sizeof(a)); +} + +void ShareTray::hupSignalHandler(int) +{ + char a = 1; + ::write(sighupFd[0], &a, sizeof(a)); +} void ShareTray::slotStopSharing() { - if ( serverSocket ) - { - serverSocket->close(); - delete serverSocket; - serverSocket=0l; - } - if ( QFile::exists ( socketFname ) ) - QFile::remove ( socketFname ); - for ( int i=menu->actions().count()-STAT_ACT_COUNT-1;i>=0;--i ) - { - slotCloseConnection ( ( AccessAction* ) ( menu->actions() [i] ) ); - } - actStop->setEnabled ( false ); - actStart->setEnabled ( true ); - setTrayIcon(); + if ( serverSocket ) + { + serverSocket->close(); + delete serverSocket; + serverSocket=0l; + } + if ( QFile::exists ( socketFname ) ) + QFile::remove ( socketFname ); + for ( int i=menu->actions().count()-STAT_ACT_COUNT-1;i>=0;--i ) + { + slotCloseConnection ( ( AccessAction* ) ( menu->actions() [i] ) ); + } + actStop->setEnabled ( false ); + actStart->setEnabled ( true ); + setTrayIcon(); } void ShareTray::slotStartSharing() { - actStop->setEnabled ( true ); - actStart->setEnabled ( false ); - if ( serverSocket ) - delete serverSocket; - if ( QFile::exists ( socketFname ) ) - QFile::remove ( socketFname ); - serverSocket=new QLocalServer ( this ); - if ( serverSocket->listen ( socketFname ) ) - { - - chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2gousers" )->gr_gid ); - QFile::setPermissions ( socketFname, - QFile::ReadOwner|QFile::WriteOwner|QFile::ReadGroup|QFile::WriteGroup ); - connect ( serverSocket,SIGNAL ( newConnection() ), - this,SLOT ( slotServerConnection() ) ); - } - else - { - QString message= - tr ( - "Can't listen on socket:" ) + socketFname; - QMessageBox::critical ( 0l,tr ( - "Error" ),message, - QMessageBox::Ok, - QMessageBox::NoButton ); - close(); - } - setTrayIcon(); + actStop->setEnabled ( true ); + actStart->setEnabled ( false ); + if ( serverSocket ) + delete serverSocket; + if ( QFile::exists ( socketFname ) ) + QFile::remove ( socketFname ); + serverSocket=new QLocalServer ( this ); + if ( serverSocket->listen ( socketFname ) ) + { + + chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid ); + QFile::setPermissions ( socketFname, + QFile::ReadOwner|QFile::WriteOwner|QFile::ReadGroup|QFile::WriteGroup ); + connect ( serverSocket,SIGNAL ( newConnection() ), + this,SLOT ( slotServerConnection() ) ); + } + else + { + QString message= + tr ( + "Can't listen on socket:" ) + socketFname; + QMessageBox::critical ( 0l,tr ( + "Error" ),message, + QMessageBox::Ok, + QMessageBox::NoButton ); + close(); + } + setTrayIcon(); } bool ShareTray::acceptConnections() { - return actStop->isEnabled(); + return actStop->isEnabled(); } QString ShareTray::getSocketAnswer ( QString message ) { - qDebug() <<"message: "<<message; - QStringList lst=message.split ( ' ' ); - if ( lst.size() !=10 ) - { - qDebug() <<"wrong parameters"; - return "DENY"; - } - QStringList params=lst[9].split ( "XSHAD" ); - if ( params.size() !=3 ) - { - qDebug() <<"wrong parameters"; - return "DENY"; - } - QString client=lst[0]; - QString user=params[1]; - if ( getAccess ( user,client ) ==QMessageBox::Yes ) - { - trayMessage ( tr ( "Access granted" ),QString ( - tr ( - "%1(%2): access granted" ) ).arg ( - user ).arg ( client ) ); - //start agent - QProcess proc ( this ); - lst.removeAt ( 0 );; - proc.start ( "x2gostartagent",lst ); - if ( !proc.waitForFinished ( 5000 ) ) - { - return "DENY"; - } - else - { - QString output=proc.readAllStandardOutput(); - qDebug() <<"agent out: "<<output; - QStringList lines=output.split ( "\n" ); - QString pid="pid"; - if ( lines.size() >3 ) - pid=lines[2]; - qDebug() <<"agent pid: "<<pid; - AccessAction *act=new AccessAction ( - pid,user,client, - QString ( tr ( "Disconnect %1(%2)" ) ).arg ( user ).arg ( client ), - this ); - menu->insertAction ( menu->actions() [0],act ); - connect ( act,SIGNAL ( actionActivated ( AccessAction* ) ),this, - SLOT ( slotCloseConnection ( AccessAction* ) ) ); - trayMessage ( tr ( "Remote connection" ), - QString ( - tr ( "%1(%2) connected" ) ).arg ( user ).arg ( client ) ); - setTrayIcon(); - return output; - } - } - trayMessage ( tr ( "Access denied" ),QString ( - tr ( "%1(%2): access denied" ) ).arg ( params[1] ).arg ( client ) ); - return "DENY"; + qDebug() <<"message: "<<message; + QStringList lst=message.split ( ' ' ); + if ( lst.size() !=11 ) + { + qDebug() <<"wrong parameters"; + return "DENY"; + } + QStringList params=lst[9].split ( "XSHAD" ); + if ( params.size() !=3 ) + { + qDebug() <<"wrong parameters"; + return "DENY"; + } + QString client=lst[0]; + QString user=params[1]; + QString remote_user=lst[10]; + if ( getAccess ( remote_user, client ) ==QMessageBox::Yes ) + { + trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) ); + //start agent + QProcess proc ( this ); + lst.removeAt ( 10 );; + lst.removeAt ( 0 );; + proc.start ( "x2gostartagent",lst ); + if ( !proc.waitForFinished ( 5000 ) ) + { + return "DENY"; + } + else + { + QString output=proc.readAllStandardOutput(); + qDebug() <<"agent out: "<<output; + QStringList lines=output.split ( "\n" ); + QString pid="pid"; + if ( lines.size() >3 ) + pid=lines[2]; + qDebug() <<"agent pid: "<<pid; + AccessAction *act=new AccessAction ( + pid,remote_user,client, + QString ( tr ( "Disconnect %1(%2)" ) ).arg ( remote_user ).arg ( client ), + this ); + menu->insertAction ( menu->actions() [0],act ); + connect ( act,SIGNAL ( actionActivated ( AccessAction* ) ),this, + SLOT ( slotCloseConnection ( AccessAction* ) ) ); + trayMessage ( tr ( "Remote connection" ), + QString ( + tr ( "%1(%2) connected" ) ).arg ( remote_user ).arg ( client ) ); + setTrayIcon(); + return output; + } + } + trayMessage ( tr ( "Access denied" ),QString ( + tr ( "%1(%2): access denied" ) ).arg ( remote_user ).arg ( client ) ); + return "DENY"; } void ShareTray::closeSocket ( SimpleLocalSocket* sock ) { - qDebug() <<"closing null socket"; - if ( sock ) - { - qDebug() <<"closing socket"; - delete sock; - qDebug() <<"done"; - } + qDebug() <<"closing null socket"; + if ( sock ) + { + qDebug() <<"closing socket"; + delete sock; + qDebug() <<"done"; + } } void ShareTray::slotServerConnection() { - new SimpleLocalSocket ( this,serverSocket->nextPendingConnection() ); + new SimpleLocalSocket ( this,serverSocket->nextPendingConnection() ); } void ShareTray::slotCloseConnection ( AccessAction* action ) { - kill ( action->pid().toUInt(),15 ); - menu->removeAction ( action ); - delete action; - setTrayIcon(); + kill ( action->pid().toUInt(),15 ); + menu->removeAction ( action ); + delete action; + setTrayIcon(); } -int ShareTray::getAccess ( QString user, QString host ) +int ShareTray::getAccess ( QString remote_user, QString host ) { - if ( whiteList.contains ( user ) ) - return QMessageBox::Yes; - if ( blackList.contains ( user ) ) - return QMessageBox::No; - - MessageBox m ( user,host, this ); - m.activateWindow(); - m.raise(); - int res=m.exec(); - if ( m.isChecked() &&res==QMessageBox::Yes ) - whiteList<<user; - if ( m.isChecked() &&res==QMessageBox::No ) - blackList<<user; - actBlack->setEnabled ( blackList.size() >0 ); - actWhite->setEnabled ( whiteList.size() >0 ); - return res; + if ( whiteList.contains ( remote_user ) ) + return QMessageBox::Yes; + if ( blackList.contains ( remote_user ) ) + return QMessageBox::No; + + MessageBox m ( remote_user, host, this ); + m.activateWindow(); + m.raise(); + int res=m.exec(); + if ( m.isChecked() &&res==QMessageBox::Yes ) + whiteList<<remote_user; + if ( m.isChecked() &&res==QMessageBox::No ) + blackList<<remote_user; + actBlack->setEnabled ( blackList.size() >0 ); + actWhite->setEnabled ( whiteList.size() >0 ); + return res; } void ShareTray::closeEvent ( QCloseEvent* ev ) { - if ( !menuClose ) - { - ev->ignore(); - hide(); - return; - } - slotStopSharing(); - if ( QFile::exists ( lockFname ) ) - QFile::remove ( lockFname ); - saveSettings(); + if ( !menuClose ) + { + ev->ignore(); + hide(); + return; + } + qDebug() <<"stopping desktop sharing"; + slotStopSharing(); + if ( QFile::exists ( lockFname ) ) + QFile::remove ( lockFname ); + qDebug() <<"lock file removed"; + saveSettings(); + qDebug() <<"settings saved"; } void ShareTray::slotTimer() { - for ( int i=menu->actions().count()-STAT_ACT_COUNT-1;i>=0;--i ) - { - AccessAction* action= ( AccessAction* ) ( menu->actions() [i] ); - if ( !isProcessRunning ( action->pid() ) ) - { - trayMessage ( tr ( "User disconnected" ), - QString ( - tr ( "%1(%2) disconnected" ) ).arg ( - action->user() ).arg ( action->host() ) ); - menu->removeAction ( action ); - delete action; - } - } - setTrayIcon(); + for ( int i=menu->actions().count()-STAT_ACT_COUNT-1;i>=0;--i ) + { + AccessAction* action= ( AccessAction* ) ( menu->actions() [i] ); + if ( !isProcessRunning ( action->pid() ) ) + { + trayMessage ( tr ( "User disconnected" ), + QString ( + tr ( "%1(%2) disconnected" ) ).arg ( + action->user() ).arg ( action->host() ) ); + menu->removeAction ( action ); + delete action; + } + } + setTrayIcon(); } void ShareTray::trayMessage ( QString title, QString text ) { - if ( !QSystemTrayIcon::supportsMessages () ) - QToolTip::showText ( geometry().topLeft(), - text ); - else - trayIcon->showMessage ( title,text ); + if ( !QSystemTrayIcon::supportsMessages () ) + QToolTip::showText ( geometry().topLeft(), + text ); + else + trayIcon->showMessage ( title,text ); } bool ShareTray::isProcessRunning ( QString pid ) { - if ( kill ( pid.toInt(),SIGCONT ) ==-1 ) - { - if ( errno==ESRCH ) - { - return false; - } - } - return true; + if ( kill ( pid.toInt(),SIGCONT ) ==-1 ) + { + if ( errno==ESRCH ) + { + return false; + } + } + return true; } void ShareTray::slotBlackList() { - current_list=BLACK; - showList(); - setWindowTitle ( tr ( "Banned users" ) ); - + current_list=BLACK; + showList(); + setWindowTitle ( tr ( "Banned users" ) ); } void ShareTray::slotWhiteList() { - current_list=WHITE; - showList(); - setWindowTitle ( tr ( "Granted users" ) ); - + current_list=WHITE; + showList(); + setWindowTitle ( tr ( "Granted users" ) ); } void ShareTray::showList() { - show(); - ui.ok_cancel_box->show(); - ui.box->show(); - ui.del->show(); - - ui.close_box->hide(); - ui.icon->hide(); - ui.text->hide(); - - QStringList* lst; - if ( current_list==BLACK ) - lst=&blackList; - else - lst=&whiteList; - lst->sort(); - ui.box->clear(); - ui.box->insertItems ( 0,*lst ); + show(); + ui.ok_cancel_box->show(); + ui.box->show(); + ui.del->show(); + + ui.close_box->hide(); + ui.icon->hide(); + ui.text->hide(); + + QStringList* lst; + if ( current_list==BLACK ) + lst=&blackList; + else + lst=&whiteList; + lst->sort(); + ui.box->clear(); + ui.box->insertItems ( 0,*lst ); } void ShareTray::loadSettings() { - QSettings st ( QDir::homePath() +"/.x2godesktopshare/settings", - QSettings::NativeFormat ); + QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", + QSettings::NativeFormat ); - blackList= st.value ( "blacklist" ).toStringList(); - whiteList= st.value ( "whitelist" ).toStringList(); + blackList= st.value ( "blacklist" ).toStringList(); + whiteList= st.value ( "whitelist" ).toStringList(); - actBlack->setEnabled ( blackList.size() >0 ); - actWhite->setEnabled ( whiteList.size() >0 ); + actBlack->setEnabled ( blackList.size() >0 ); + actWhite->setEnabled ( whiteList.size() >0 ); } void ShareTray::saveSettings() { - QSettings st ( QDir::homePath() +"/.x2godesktopshare/settings", - QSettings::NativeFormat ); + QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", + QSettings::NativeFormat ); - st.setValue ( "blacklist",blackList ); - st.setValue ( "whitelist",whiteList ); + st.setValue ( "blacklist",blackList ); + st.setValue ( "whitelist",whiteList ); } void ShareTray::setTrayIcon() { - if ( !acceptConnections() ) - { - trayIcon->setIcon ( QIcon ( ":icons/22x22/discard.png" ) ); - return; - } - if ( menu->actions().count() >STAT_ACT_COUNT ) - { - trayIcon->setIcon ( QIcon ( ":icons/22x22/view.png" ) ); - return; - } - trayIcon->setIcon ( QIcon ( ":icons/22x22/accept.png" ) ); + if ( !acceptConnections() ) + { + trayIcon->setIcon ( QIcon ( ":icons/22x22/discard.png" ) ); + return; + } + if ( menu->actions().count() >STAT_ACT_COUNT ) + { + trayIcon->setIcon ( QIcon ( ":icons/22x22/view.png" ) ); + return; + } + trayIcon->setIcon ( QIcon ( ":icons/22x22/accept.png" ) ); } void ShareTray::slotAbout() { - setWindowTitle ( tr ( "X2Go Desktop Sharing" ) ); + setWindowTitle ( tr ( "X2Go Desktop Sharing" ) ); - show(); - ui.ok_cancel_box->hide(); - ui.box->hide(); - ui.del->hide(); + show(); + ui.ok_cancel_box->hide(); + ui.box->hide(); + ui.del->hide(); - ui.close_box->show(); - ui.icon->show(); - ui.text->show(); + ui.close_box->show(); + ui.icon->show(); + ui.text->show(); } void ShareTray::slotAboutQt() { - QMessageBox::aboutQt ( 0 ); + QMessageBox::aboutQt ( 0 ); } void ShareTray::slotMsgOkCancel ( QAbstractButton* button ) { - if ( ui.ok_cancel_box->buttonRole ( button ) ==QDialogButtonBox::AcceptRole ) - { - QStringList* lst; - if ( current_list==BLACK ) - lst=&blackList; - else - lst=&whiteList; - lst->clear(); - for ( int i=ui.box->count()-1;i>=0;--i ) - { - *lst<<ui.box->item ( i )->text(); - } - } - actBlack->setEnabled ( blackList.size() >0 ); - actWhite->setEnabled ( whiteList.size() >0 ); - hide(); + if ( ui.ok_cancel_box->buttonRole ( button ) ==QDialogButtonBox::AcceptRole ) + { + QStringList* lst; + if ( current_list==BLACK ) + lst=&blackList; + else + lst=&whiteList; + lst->clear(); + for ( int i=ui.box->count()-1;i>=0;--i ) + { + *lst<<ui.box->item ( i )->text(); + } + } + actBlack->setEnabled ( blackList.size() >0 ); + actWhite->setEnabled ( whiteList.size() >0 ); + hide(); } void ShareTray::slotMsgClose ( QAbstractButton* ) { - hide(); + hide(); } void ShareTray::slotDelListItem() { - for ( int i=ui.box->count()-1;i>=0;--i ) - { - QListWidgetItem* it=ui.box->item ( i ); - if ( it->isSelected() ) - { - ui.box->takeItem ( i ); - delete it; - } - } + for ( int i=ui.box->count()-1;i>=0;--i ) + { + QListWidgetItem* it=ui.box->item ( i ); + if ( it->isSelected() ) + { + ui.box->takeItem ( i ); + delete it; + } + } } void ShareTray::slotMenuClose() { - menuClose=true; - close(); + menuClose=true; + close(); } - - void ShareTray::slotUpdateLockFile() { - QFile file ( lockFname ); - if ( file.open ( QIODevice::WriteOnly | QIODevice::Text ) ) - { - QTextStream out ( &file ); - out<<QDateTime::currentDateTime().toTime_t(); - } + QFile file ( lockFname ); + if ( file.open ( QIODevice::WriteOnly | QIODevice::Text ) ) + { + QTextStream out ( &file ); + out<<QDateTime::currentDateTime().toTime_t(); + } } diff --git a/sharetray.h b/sharetray.h index 137ba61..71c792a 100644 --- a/sharetray.h +++ b/sharetray.h @@ -22,62 +22,85 @@ class AccessAction; class QSystemTrayIcon; class MessageBox; class QAction; +class QSocketNotifier; /** @author Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> */ class ShareTray : public QMainWindow { - Q_OBJECT + Q_OBJECT public: - ShareTray(); - ~ShareTray(); - QString getSocketAnswer(QString message); - void closeSocket(SimpleLocalSocket* sock); - bool acceptConnections(); + ShareTray(); + ~ShareTray(); + // Unix signal handlers. + static void keybintSignalHandler(int unused); + static void termSignalHandler(int unused); + static void abortSignalHandler(int unused); + static void hupSignalHandler(int unused); + // desktop sharing socket + QString getSocketAnswer(QString message); + void closeSocket(SimpleLocalSocket* sock); + // entry point for incoming connections + bool acceptConnections(); private: - enum {BLACK,WHITE} current_list; - QMenu* menu; - QWidget* mainWnd; - QAction* actStart; - QAction* actStop; - QAction* actWhite; - QAction* actBlack; - QSystemTrayIcon* trayIcon; - QLocalServer* serverSocket; - QString socketFname; - QString lockFname; - MessageBox* mbox; - QStringList whiteList; - QStringList blackList; - Ui::mwnd ui; - bool menuClose; + enum {BLACK,WHITE} current_list; + QMenu* menu; + QWidget* mainWnd; + QAction* actStart; + QAction* actStop; + QAction* actWhite; + QAction* actBlack; + QSystemTrayIcon* trayIcon; + QLocalServer* serverSocket; + QString socketFname; + QString lockFname; + MessageBox* mbox; + QStringList whiteList; + QStringList blackList; + Ui::mwnd ui; + bool menuClose; protected: - void closeEvent ( QCloseEvent* event ); + void closeEvent ( QCloseEvent* event ); +public slots: + // Qt signal handlers. + void handleSigKeybInt(); + void handleSigTerm(); + void handleSigAbort(); + void handleSigHup(); + void slotMenuClose(); private slots: - void slotStopSharing(); - void slotStartSharing(); - void slotServerConnection(); - void slotCloseConnection(AccessAction* action); - void slotTimer(); - void slotWhiteList(); - void slotBlackList(); - void slotAboutQt(); - void slotAbout(); - void slotMsgClose(QAbstractButton*); - void slotMsgOkCancel(QAbstractButton* button); - void slotDelListItem(); - void slotMenuClose(); - void slotUpdateLockFile(); + void slotStopSharing(); + void slotStartSharing(); + void slotServerConnection(); + void slotCloseConnection(AccessAction* action); + void slotTimer(); + void slotWhiteList(); + void slotBlackList(); + void slotAboutQt(); + void slotAbout(); + void slotMsgClose(QAbstractButton*); + void slotMsgOkCancel(QAbstractButton* button); + void slotDelListItem(); + void slotUpdateLockFile(); private: - int getAccess(QString user, QString host); - void trayMessage(QString title, QString text); - bool isProcessRunning(QString pid); - void loadSettings(); - void saveSettings(); - void setTrayIcon(); - void showList(); + int getAccess(QString user, QString host); + void trayMessage(QString title, QString text); + bool isProcessRunning(QString pid); + void loadSettings(); + void saveSettings(); + void setTrayIcon(); + void showList(); + // unix file sockets for signal handler communication (unix <-> Qt) + static int sigkeybintFd[2]; + static int sigtermFd[2]; + static int sigabortFd[2]; + static int sighupFd[2]; + QSocketNotifier *snKeybInt; + QSocketNotifier *snTerm; + QSocketNotifier *snAbort; + QSocketNotifier *snHup; }; #endif hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing 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 "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits