x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-20-gff1c183
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, release/0.1.1.x has been updated via ff1c183ebfc1bee38502dd81f56326221b428000 (commit) from 670e3d0355cc32ae0678156e1544c5bd0aeb1f10 (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 ff1c183ebfc1bee38502dd81f56326221b428000 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 00:30:49 2011 +0200 cosmetic fix for share_desktop method ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 6b40872..9428278 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1162,11 +1162,11 @@ class X2goSession(object): return self.running else: self.terminal_session = None - return False else: self._X2goSession__disconnect() - return False + + return False __share_desktop = share_desktop def suspend(self): hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-22-g746fb6e
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, master has been updated via 746fb6ee2d8c028b13ca476b990e6b825dfb7b41 (commit) from 55cd3f8f5320963600a91f598758c9e0acc7cd39 (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 746fb6ee2d8c028b13ca476b990e6b825dfb7b41 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 00:30:49 2011 +0200 cosmetic fix for share_desktop method ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index e3738cf..aa421d8 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1162,11 +1162,11 @@ class X2goSession(object): return self.running else: self.terminal_session = None - return False else: self._X2goSession__disconnect() - return False + + return False __share_desktop = share_desktop def suspend(self): hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-7-g91e0971
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, master has been updated via 91e0971284d686e42f444e312cf3220ea22ea6f9 (commit) via 4cf4a0b2dad35e92ddaac712c9d2b6f513cd4a46 (commit) from ecfddd98ebfd7f844942ebba155240ba7a388e22 (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 91e0971284d686e42f444e312cf3220ea22ea6f9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 16 23:18:51 2011 +0200 Make sure postinst script does not fail when checking for existence of group x2godesktopsharing. commit 4cf4a0b2dad35e92ddaac712c9d2b6f513cd4a46 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 2 15:18:54 2011 +0200 System group for x2godesktopsharing change from x2gousers -> x2godesktopsharing. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ debian/x2godesktopsharing.postinst | 4 ++-- sharetray.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b8c5bf1..b0d3854 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low * Fix incomplete DENY statement in main.cpp. + * System group for x2godesktopsharing change from x2gousers -> + x2godesktopsharing. + * Make sure postinst script does not fail when checking for existence + of group x2godesktopsharing. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 13 Jun 2011 20:39:33 +0200 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/sharetray.cpp b/sharetray.cpp index 7fe23f0..9f42997 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -215,7 +215,7 @@ void ShareTray::slotStartSharing() if ( serverSocket->listen ( socketFname ) ) { - chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2gousers" )->gr_gid ); + chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid ); QFile::setPermissions ( socketFname, QFile::ReadOwner|QFile::WriteOwner|QFile::ReadGroup|QFile::WriteGroup ); connect ( serverSocket,SIGNAL ( newConnection() ), 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

pyhoca-gui.git - master (branch) updated: 0.1.0.6-22-ge921529
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, master has been updated via e9215294febee3f224594860eed0f2196d7e2007 (commit) via f23eebb111e36c056297ae66e16a64b9534ef6a7 (commit) from d1f91922ee400ba9d6e58330ea697e781ce646ef (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 e9215294febee3f224594860eed0f2196d7e2007 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 16 22:29:00 2011 +0200 Help output fixes. commit f23eebb111e36c056297ae66e16a64b9534ef6a7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 28 16:12:55 2011 +0200 Fix for usekbd session profile option, it was misinterpreted before... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca-gui | 8 ++++---- pyhoca/wxgui/profilemanager.py | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2e1a82c..53823d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ pyhoca-gui (0.1.0.7-0~x2go1) UNRELEASED; urgency=low raisure), requires Python X2go >= 0.1.1.5. - Provide complete list of compression methods, profile manager GUI improved. + - Fix for usekbd session profile option, it was misinterpreted before... -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 06 Jul 2011 22:17:10 +0200 diff --git a/pyhoca-gui b/pyhoca-gui index 3723004..2052b38 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -174,11 +174,11 @@ x2go_gui_options = [ {'args':['--auto-connect'], 'default': False, 'action': 'store_true', 'help': 'connect sessions via SSH pubkey authentication if possible', }, {'args':['--show-profile-metatypes'], 'default': False, 'action': 'store_true', 'help': 'show descriptive meta information on session profiles in menus (NOTE: this makes menus appear a bit more sluggish, use it mostly for debugging)', }, {'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit', }, - {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication', }, + {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', }, {'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', }, - {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': ' on connect auto-resume the newest suspended session', }, - {'args':['--resume-oldest-on-connect'], 'default': False, 'action': 'store_true', 'help': ' on connect auto-resume the oldest suspended session', }, - {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended session on connect', }, + {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the newest suspended session', }, + {'args':['--resume-oldest-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the oldest suspended session', }, + {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended sessions on connect', }, {'args':['--disconnect-on-suspend'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been suspended', }, {'args':['--disconnect-on-terminate'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been terminated', }, {'args':['--disable-splash'], 'default': False, 'action': 'store_true', 'help': 'disable the applications splash screen', }, diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index d3f0254..43812bb 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -825,10 +825,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.DisplayDPI.Enable(True) # TODO Fill in the actual DPI - self.CurrentKeyBoard.SetValue(self.profile_config['usekbd']) + self.CurrentKeyBoard.SetValue(not self.profile_config['usekbd']) self.KeyboardLayout.SetValue(self.profile_config['layout']) self.KeyboardModel.SetValue(self.profile_config['type']) - if self.profile_config['usekbd']: + if self.CurrentKeyBoard.GetValue(): self.KeyboardLayoutLabel.Enable(False) self.KeyboardModelLabel.Enable(False) self.KeyboardLayout.Enable(False) @@ -984,7 +984,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['setdpi'] = self.SetDisplayDPI.GetValue() self.profile_config['dpi'] = self.DisplayDPI.GetValue() - self.profile_config['usekbd'] = self.CurrentKeyBoard.GetValue() + self.profile_config['usekbd'] = not self.CurrentKeyBoard.GetValue() self.profile_config['layout'] = self.KeyboardLayout.GetValue() self.profile_config['type'] = self.KeyboardModel.GetValue() hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

x2golxdebindings.git - build-main (branch) created: 35b86a6fdfa93eb807413d9f22425c5dc2971246
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, build-main has been created at 35b86a6fdfa93eb807413d9f22425c5dc2971246 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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: 35b86a6fdfa93eb807413d9f22425c5dc2971246
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, master has been updated via 35b86a6fdfa93eb807413d9f22425c5dc2971246 (commit) from f90374826429b67a92f461529f08e10c302935b8 (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 35b86a6fdfa93eb807413d9f22425c5dc2971246 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 16 14:10:01 2011 +0200 LXDE icon theme does not have scalable icons. ----------------------------------------------------------------------- Summary of changes: .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.png | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.png | 1 + .../application-sshfsremovable-x2go-lxde.png | 1 + .../mimetypes/application-sshfscdrom-x2go-lxde.svg | 1 - .../mimetypes/application-sshfsdisk-x2go-lxde.svg | 1 - .../application-sshfsremovable-x2go-lxde.svg | 1 - 33 files changed, 30 insertions(+), 3 deletions(-) create mode 120000 share/icons/nuoveXT2/128x128/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/128x128/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/128x128/mimetypes/application-sshfsremovable-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/16x16/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/16x16/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/16x16/mimetypes/application-sshfsremovable-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/22x22/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/22x22/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/22x22/mimetypes/application-sshfsremovable-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/24x24/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/24x24/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/24x24/mimetypes/application-sshfsremovable-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/32x32/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/32x32/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/32x32/mimetypes/application-sshfsremovable-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/36x36/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/36x36/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/36x36/mimetypes/application-sshfsremovable-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/48x48/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/48x48/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/48x48/mimetypes/application-sshfsremovable-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/64x64/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/64x64/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/64x64/mimetypes/application-sshfsremovable-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/72x72/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/72x72/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/72x72/mimetypes/application-sshfsremovable-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/96x96/mimetypes/application-sshfscdrom-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/96x96/mimetypes/application-sshfsdisk-x2go-lxde.png create mode 120000 share/icons/nuoveXT2/96x96/mimetypes/application-sshfsremovable-x2go-lxde.png delete mode 120000 share/icons/nuoveXT2/scalable/mimetypes/application-sshfscdrom-x2go-lxde.svg delete mode 120000 share/icons/nuoveXT2/scalable/mimetypes/application-sshfsdisk-x2go-lxde.svg delete mode 120000 share/icons/nuoveXT2/scalable/mimetypes/application-sshfsremovable-x2go-lxde.svg The diff of changes is: diff --git a/share/icons/nuoveXT2/128x128/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/128x128/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/128x128/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/16x16/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/16x16/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/16x16/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/22x22/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/22x22/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/22x22/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/24x24/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/24x24/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/24x24/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/32x32/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/32x32/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/32x32/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/36x36/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/36x36/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/36x36/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/48x48/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/48x48/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/48x48/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/64x64/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/64x64/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/64x64/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/72x72/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/72x72/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/72x72/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/96x96/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/96x96/mimetypes/application-sshfscdrom-x2go-lxde.png new file mode 120000 index 0000000..6b99215 --- /dev/null +++ b/share/icons/nuoveXT2/96x96/mimetypes/application-sshfscdrom-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-optical.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsdisk-x2go-lxde.png new file mode 120000 index 0000000..4be8402 --- /dev/null +++ b/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsdisk-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-harddisk.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsremovable-x2go-lxde.png new file mode 120000 index 0000000..02e0e62 --- /dev/null +++ b/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsremovable-x2go-lxde.png @@ -0,0 +1 @@ +../devices/drive-removable-media.png \ No newline at end of file diff --git a/share/icons/nuoveXT2/scalable/mimetypes/application-sshfscdrom-x2go-lxde.svg b/share/icons/nuoveXT2/scalable/mimetypes/application-sshfscdrom-x2go-lxde.svg deleted file mode 120000 index 0bd7947..0000000 --- a/share/icons/nuoveXT2/scalable/mimetypes/application-sshfscdrom-x2go-lxde.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/nuoveXT2/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsdisk-x2go-lxde.svg b/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsdisk-x2go-lxde.svg deleted file mode 120000 index 9c9c429..0000000 --- a/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsdisk-x2go-lxde.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/nuoveXT2/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsremovable-x2go-lxde.svg b/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsremovable-x2go-lxde.svg deleted file mode 120000 index 9e3fa81..0000000 --- a/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsremovable-x2go-lxde.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/nuoveXT2/scalable/devices/drive-removable-media.svg \ No newline at end of file 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: f90374826429b67a92f461529f08e10c302935b8
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, master has been updated via f90374826429b67a92f461529f08e10c302935b8 (commit) via f5e65f56e1aa7d24df0c47175cdadeaebb750f74 (commit) via 29337c46178938f885ce606125533f2f00373301 (commit) from e2b79e29e640b1aa824173e1b2a4ab879ce3672f (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 f90374826429b67a92f461529f08e10c302935b8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 16 13:45:57 2011 +0200 Add icon symlinks for sshfs/LXDE MIME types. commit f5e65f56e1aa7d24df0c47175cdadeaebb750f74 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 16 13:45:15 2011 +0200 removal of unneeded dirs (Debian package) commit 29337c46178938f885ce606125533f2f00373301 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 16 13:43:30 2011 +0200 changelog fix... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 13 ++++--------- debian/control | 3 ++- debian/x2golxdebindings.dirs | 2 -- .../mimetypes/application-sshfscdrom-x2go-lxde.svg | 1 + .../mimetypes/application-sshfsdisk-x2go-lxde.svg | 1 + .../application-sshfsremovable-x2go-lxde.svg | 1 + 6 files changed, 9 insertions(+), 12 deletions(-) create mode 120000 share/icons/nuoveXT2/scalable/mimetypes/application-sshfscdrom-x2go-lxde.svg create mode 120000 share/icons/nuoveXT2/scalable/mimetypes/application-sshfsdisk-x2go-lxde.svg create mode 120000 share/icons/nuoveXT2/scalable/mimetypes/application-sshfsremovable-x2go-lxde.svg The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1c64a80..2513f7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,11 @@ -x2golxdebindings (1.0.1.0-0~x2go2) UNRELEASED; urgency=low +x2golxdebindings (1.0.1.0-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] - * Nothing yet. + * Imported original tarball version to X2go Git. + * Adds Debian/Ubuntu packaging (/debian folder). + * Add icon symlinks for sshfs/LXDE MIME types. [ Milan Knížek ] * Fix for wrong/test MIME type in x2gopcmanfm.desktop. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 16 Aug 2011 12:33:53 +0200 - -x2golxdebindings (1.0.1.0-0~x2go1) unstable; urgency=low - - * Imported original tarball version to X2go Git - * Adds Debian/Ubuntu packaging (/debian folder) - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 29 May 2011 22:36:34 +0200 diff --git a/debian/control b/debian/control index 4b7dd83..45eb109 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Package: x2golxdebindings Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, - x2goserver + x2goserver, + lxde-icon-theme Description: LXDE bindings for X2go X2go is a server based computing environment with - session resuming diff --git a/debian/x2golxdebindings.dirs b/debian/x2golxdebindings.dirs index 183c74f..45adc59 100644 --- a/debian/x2golxdebindings.dirs +++ b/debian/x2golxdebindings.dirs @@ -1,5 +1,3 @@ usr/bin -usr/sbin -etc/xdg/menus usr/share/x2go usr/share/x2go/versions diff --git a/share/icons/nuoveXT2/scalable/mimetypes/application-sshfscdrom-x2go-lxde.svg b/share/icons/nuoveXT2/scalable/mimetypes/application-sshfscdrom-x2go-lxde.svg new file mode 120000 index 0000000..0bd7947 --- /dev/null +++ b/share/icons/nuoveXT2/scalable/mimetypes/application-sshfscdrom-x2go-lxde.svg @@ -0,0 +1 @@ +/usr/share/icons/nuoveXT2/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsdisk-x2go-lxde.svg b/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsdisk-x2go-lxde.svg new file mode 120000 index 0000000..9c9c429 --- /dev/null +++ b/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsdisk-x2go-lxde.svg @@ -0,0 +1 @@ +/usr/share/icons/nuoveXT2/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsremovable-x2go-lxde.svg b/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsremovable-x2go-lxde.svg new file mode 120000 index 0000000..9e3fa81 --- /dev/null +++ b/share/icons/nuoveXT2/scalable/mimetypes/application-sshfsremovable-x2go-lxde.svg @@ -0,0 +1 @@ +/usr/share/icons/nuoveXT2/scalable/devices/drive-removable-media.svg \ No newline at end of file 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: e2b79e29e640b1aa824173e1b2a4ab879ce3672f
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, master has been updated via e2b79e29e640b1aa824173e1b2a4ab879ce3672f (commit) from 7b4066478085c8a50109ca4f9dce093ef6f81531 (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 e2b79e29e640b1aa824173e1b2a4ab879ce3672f Author: Milan Knížek <knizek.confy(a)volny.cz> Date: Tue Aug 16 12:35:44 2011 +0200 Fix for wrong/test MIME type in x2gopcmanfm.desktop. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++++++++++ share/applications/x2gopcmanfm.desktop | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index dd50236..1c64a80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +x2golxdebindings (1.0.1.0-0~x2go2) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * Nothing yet. + + [ Milan Knížek ] + * Fix for wrong/test MIME type in x2gopcmanfm.desktop. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 16 Aug 2011 12:33:53 +0200 + x2golxdebindings (1.0.1.0-0~x2go1) unstable; urgency=low * Imported original tarball version to X2go Git diff --git a/share/applications/x2gopcmanfm.desktop b/share/applications/x2gopcmanfm.desktop index af6442e..d6245ac 100644 --- a/share/applications/x2gopcmanfm.desktop +++ b/share/applications/x2gopcmanfm.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=x2gopcmanfm -MimeType=application/pcman-sshfsdisk;application/pcman-sshfscdrom;application/pcman-sshfsremovable +MimeType=application/sshfsdisk-x2go-lxde;application/sshfscdrom-x2go-lxde;application/sshfsremovable-x2go-lxde Exec=x2gopcmanfm %f Type=Application Terminal=false 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

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-19-g670e3d0
by git-admin＠x2go.org 15 Aug '11

15 Aug '11

The branch, release/0.1.1.x has been updated via 670e3d0355cc32ae0678156e1544c5bd0aeb1f10 (commit) via 0cbb6adeb83487872c9786d3311883c89345bd15 (commit) from 7be509ca50a0767fd13f9a358b18cde3e44a3d0d (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 670e3d0355cc32ae0678156e1544c5bd0aeb1f10 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 15 21:49:49 2011 +0200 typo fix (with impact) commit 0cbb6adeb83487872c9786d3311883c89345bd15 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 15 21:17:29 2011 +0200 launch the x2goagent+command earlier during session creation... ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 3 +-- x2go/session.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index f7bea1d..918898a 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -750,7 +750,6 @@ class X2goTerminalSessionSTDOUT(object): # do not run command when in DESKTOP SHARING mode... return None - self.params.update({'cmd': cmd}) # do not allow the execution of full path names @@ -765,7 +764,7 @@ class X2goTerminalSessionSTDOUT(object): _rewrite_blanks(_rewrite_cmd(cmd, params=self.params)), str(self.params.snd_system), str(self.params.session_type), - ">& /dev/null & exit", + "&> /dev/null & exit", ] if self.params.snd_system == 'pulse': diff --git a/x2go/session.py b/x2go/session.py index 90b4f83..6b40872 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1025,6 +1025,9 @@ class X2goSession(object): if self.has_terminal_session() and not self.faulty: + # only run the session startup command if we do not resume... + if _new_session: + self.terminal_session.run_command(env=self.session_environment) if self._SUPPORTED_SOUND and self.terminal_session.params.snd_system is not 'none': self.terminal_session and not self.faulty and self.terminal_session.start_sound() @@ -1061,9 +1064,6 @@ class X2goSession(object): for _folder in self.share_local_folders: self.share_local_folder(_folder) - # only run the session startup command if we do not resume... - if _new_session: - self.terminal_session.run_command(env=self.session_environment) self.virgin = False self.suspended = False hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-189-g3180bf5
by git-admin＠x2go.org 15 Aug '11

15 Aug '11

The branch, master has been updated via 3180bf56e351ba89d33824fbf31be57c4f1f3e93 (commit) via 5ca4d96cb3f5788dc631a7b4d512fa5cd40bcb82 (commit) from 1baf675e4dd77d98c598df7f4a9c80fa47a620db (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 3180bf56e351ba89d33824fbf31be57c4f1f3e93 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 15 22:01:05 2011 +0200 remove redundant which call in x2goruncommand commit 5ca4d96cb3f5788dc631a7b4d512fa5cd40bcb82 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 15 22:00:37 2011 +0200 Fix for TERMINAL command execution if konsole (KDE4) is installed on the server (closes upstream issue #87) ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2goruncommand | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 05870f1..db55b6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * 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) [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 42156b9..50dcff7 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -85,6 +85,8 @@ if [ "$cmd" == "TERMINAL" ]; then IMEXIT="true" if [ -e "/usr/bin/konsole" ]; then cmd="/usr/bin/konsole" + # KDE4 konsole behaves differently from other terminals + IMEXIT="false" elif [ -e "/usr/bin/gnome-terminal" ]; then cmd="/usr/bin/gnome-terminal" elif [ -e "/usr/bin/lxterminal" ]; then @@ -104,7 +106,7 @@ then IMEXIT="true" fi -if [ "$EXEC" != "" ] && [ -x `which $cmd` ]; then +if [ "$EXEC" != "" ] && [ -x $EXEC ]; then $cmd #### some applications can quit immediately, we will wait here as long as x2goagent exists if [ "$X2GO_SESS_TYPE" == "R" ] && [ "$IMEXIT" == "false" ]; then 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits