The branch, master has been updated
via 22ede8d3f939d849856feeaad0e777738fbeea9b (commit)
from df4c17c9ef5337a453323b0f933039a4b8cac9a5 (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 22ede8d3f939d849856feeaad0e777738fbeea9b
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Wed Sep 12 13:54:33 2012 +0200
/debian/control: typo fix
-----------------------------------------------------------------------
Summary of changes:
debian/control | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/control b/debian/control
index ede1801..ce2467e 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Suggests:
x2goserver-compat (= ${source:Version}),
x2goserver-xsession (= ${source:Version}),
x2goserver-fmbindings (= ${source:Version}),
- x2goserver-pyhoca (= ${source:Version})
+ x2goserver-pyhoca (= ${source:Version}),
rdesktop,
pulseaudio-utils
Breaks:
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).
[View Less]
The branch, master has been updated
via df4c17c9ef5337a453323b0f933039a4b8cac9a5 (commit)
from 0c3542c4b6710d97ad11f182e0ec8c0f5198b9e4 (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 df4c17c9ef5337a453323b0f933039a4b8cac9a5
Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-…
[View More]nice.de>
Date: Wed Sep 12 13:33:55 2012 +0200
remove "-nolisten tcp" option with XDMCP sessions
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 +++
x2goserver/bin/x2gostartagent | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 462dee4..740b935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
+ Fix x2goagent dependency.
+ Add rdesktop and pulseaudio-utils to Suggests.
+ [ Oleksandr Shneyder ]
+ * remove "-nolisten tcp" option with XDMCP sessions
+
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200
x2goserver (3.1.1.3-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index abf1422..c049566 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -247,8 +247,10 @@ else
X2GODPIOPTION_="-dpi $X2GODPI"
fi
+NOLISTOPT=""
if [ "$X2GOXDMCP" == "" ] ;then
XDMCPOPT=""
+ NOLISTOPT="-nolisten tcp"
else
XDMCPOPT="-query $X2GOXDMCP"
fi
@@ -260,10 +262,10 @@ SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
if [ "$X2GO_STYPE" == "S" ]; then
# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
- NX_TEMP=/tmp x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
+ NX_TEMP=/tmp x2goagent $NOLISTOPT $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
else
# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
- NX_TEMP=/tmp x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
+ NX_TEMP=/tmp x2goagent $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
fi
X2GO_AGENT_PID=$!
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).
[View Less]
The branch, master has been updated
via bcd2472dcb7607546a1f801cf862661b50f0cad2 (commit)
from 60d5a88d02fbf006f76219e8aae57e0d9a081eee (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 bcd2472dcb7607546a1f801cf862661b50f0cad2
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Sep 11 21:28:53 2012 +0200
Use session type 'D' for X2Go-proxied RDP session when run in fullscreen mode. Fixes upstream issue #27.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 +++-
x2go/backends/terminal/_stdout.py | 7 +++----
2 files changed, 6 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 314e62f..2031bbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (0.2.0.10):
+ - Use session type 'D' for X2Go-proxied RDP session when run in
+ fullscreen mode. Fixes upstream issue #27.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 18:29:04 +0200
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index bcd6771..ef01b56 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -143,10 +143,9 @@ class X2goSessionParams(object):
self.session_type = 'P'
self.cmd = 'PUBLISHED'
else:
- if cmd == 'RDP':
- self.session_type = 'R'
- elif cmd.startswith('rdesktop'):
- self.session_type = 'R'
+ if cmd == 'RDP' or cmd.startswith('rdesktop') or cmd.startswith('xfreedrp'):
+ if self.geometry == 'fullscreen': self.session_type = 'D'
+ else: self.session_type = 'R'
elif cmd == 'XDMCP':
self.session_type = 'D'
elif cmd in _X2GO_DESKTOPSESSIONS.keys():
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).
[View Less]
The branch, master has been updated
via 2064f1f03a69ddff01503c308fc6ea31e5785cd0 (commit)
from 1c4064a61af7cd322b3a755913dfe448cfccb005 (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 2064f1f03a69ddff01503c308fc6ea31e5785cd0
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Sep 11 16:32:55 2012 +0200
fix missing curly brackets
-----------------------------------------------------------------------
Summary of changes:
onmainwindow.cpp | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index ef8b7c8..396503d 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -5654,12 +5654,14 @@ void ONMainWindow::runCommand()
{
command="rdesktop ";
if ( rdpFS )
+ {
command+=" -f ";
sessionType="D";
rootless=false;
- else
+ } else {
command+=" -g "+rdpWidth+"x"+rdpHeight;
rootless=true;
+ }
command+=" "+rdpOpts+ " "+rdpServer;
}
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
[View Less]
The branch, master has been updated
via 1c4064a61af7cd322b3a755913dfe448cfccb005 (commit)
from 638fc5d159cdd86a3020e6de13b831f9eb4d4377 (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 1c4064a61af7cd322b3a755913dfe448cfccb005
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Sep 11 16:18:54 2012 +0200
Run X2Go-proxied RDP session with fullscreen mode as sessions of X2Go session type "D". Closes upstream issue #22.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
onmainwindow.cpp | 12 ++++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2248d48..a5de44f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low
- Rebuild i18n files, add x2goclient_dk.ts for the new
Danish translator (Christoffer Krakou).
- Update German translation.
+ - Run X2Go-proxied RDP session with fullscreen mode as sessions
+ of X2Go session type "D". Closes upstream issue #22.
* Add rdesktop and xfreerdp to Recommends.
[ Daniel Lindgren ]
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 7fb4cdd..ef8b7c8 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -3485,7 +3485,13 @@ void ONMainWindow::startNewSession()
}
}
if ( command=="RDP" )
- rootless=true;
+ {
+ if (fullscreen) {
+ rootless=false;
+ } else {
+ rootless=true;
+ }
+ }
if ( command=="XDMCP" )
{
runRemoteCommand=false;
@@ -5649,11 +5655,13 @@ void ONMainWindow::runCommand()
command="rdesktop ";
if ( rdpFS )
command+=" -f ";
+ sessionType="D";
+ rootless=false;
else
command+=" -g "+rdpWidth+"x"+rdpHeight;
+ rootless=true;
command+=" "+rdpOpts+ " "+rdpServer;
- sessionType="R";
}
if ( managedMode )
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
[View Less]
The branch, master has been updated
via 638fc5d159cdd86a3020e6de13b831f9eb4d4377 (commit)
from e08120febbdab38e9fcbea50c1a9701c2d49287e (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 638fc5d159cdd86a3020e6de13b831f9eb4d4377
Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-…
[View More]nice.de>
Date: Mon Sep 10 13:00:55 2012 +0200
Show "Advanced Options" button only if RDP session chosen
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
sessionwidget.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f096102..2248d48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low
- Add translation for checkbox "Direct RDP Connection" and update Russian
and German translation.
- Restart pulse server on windows if it crashed.
+ - Show "Advanced Options" button only if RDP session chosen
-- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Wed, 05 Sep 2012 11:40:47 +0200
diff --git a/sessionwidget.cpp b/sessionwidget.cpp
index 1dc1a18..f6f62d8 100644
--- a/sessionwidget.cpp
+++ b/sessionwidget.cpp
@@ -219,7 +219,7 @@ void SessionWidget::slot_rdpDirectClicked()
bool isDirectRDP=cbDirectRDP->isChecked();
if (cbDirectRDP->isHidden())
isDirectRDP=false;
- pbAdvanced->setVisible(!isDirectRDP);
+ pbAdvanced->setVisible((!isDirectRDP) && (sessBox->currentIndex()==RDP));
leCmdIp->setVisible(!isDirectRDP);
cmd->setVisible(!isDirectRDP);
key->setVisible(!isDirectRDP);
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
[View Less]
The branch, master has been updated
via 0c3542c4b6710d97ad11f182e0ec8c0f5198b9e4 (commit)
via 452498574b305425ec8a2e81b82ea86e4c5f67d4 (commit)
from 2b68ff4432efb0f7058da0e4c8c3f2dfb446d459 (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 0c3542c4b6710d97ad11f182e0ec8c0f5198b9e4
…
[View More]Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Thu Sep 6 09:22:32 2012 +0200
use if clauses instead of ampersand shell constructions
commit 452498574b305425ec8a2e81b82ea86e4c5f67d4
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Thu Sep 6 09:21:23 2012 +0200
Proxy X2Go client-side shares into remote desktop session.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver/bin/x2goruncommand | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 50a2f5a..462dee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
- Fix x2gosessionlimit script.
- Wrap padsp around rdesktop calls if pulse is used as audio protocol.
- Add option ,,-r sound:local'' to rdesktop calls if pulse is enabled.
+ - Proxy X2Go client-side shares into remote desktop session.
* /debian/control:
+ Fix x2goagent dependency.
+ Add rdesktop and pulseaudio-utils to Suggests.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 93e731f..7be8039 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -185,10 +185,13 @@ BNAME=`basename "$EXEC"`
if [ "$BNAME" == "rdesktop" ]
then
IMEXIT="true"
- which padsp >/dev/null && {
+ if which padsp >/dev/null; then
EXEC_WRAPPER="padsp"
args=" -r sound:local"
- }
+ fi
+ if [ -d "$HOME/media" ]; then
+ args+=" -r disk:X2GoMedia=$HOME/media"
+ fi
fi
if [ "$X2GO_SESS_TYPE" == "P" ]
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).
[View Less]
The branch, master has been updated
via 2b68ff4432efb0f7058da0e4c8c3f2dfb446d459 (commit)
from df13257d3fe83b4e12f9117f39e82b05276c44a1 (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 2b68ff4432efb0f7058da0e4c8c3f2dfb446d459
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Thu Sep 6 09:02:37 2012 +0200
Add rdesktop and pulseaudio-utils to Suggests.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/control | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8dae37b..50a2f5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
- Add option ,,-r sound:local'' to rdesktop calls if pulse is enabled.
* /debian/control:
+ Fix x2goagent dependency.
+ + Add rdesktop and pulseaudio-utils to Suggests.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200
diff --git a/debian/control b/debian/control
index 6b34243..ede1801 100644
--- a/debian/control
+++ b/debian/control
@@ -45,6 +45,8 @@ Suggests:
x2goserver-xsession (= ${source:Version}),
x2goserver-fmbindings (= ${source:Version}),
x2goserver-pyhoca (= ${source:Version})
+ rdesktop,
+ pulseaudio-utils
Breaks:
x2goserver-one,
x2goserver-home,
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).
[View Less]