[X2Go-Commits] [x2goclient] branch master updated (36552d1 -> 9af7ec4)

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goclient.

  from  36552d1   Bump version to 4.1.1.0.
   new  9af7ec4   debian/changelog: merge changelog from release/4.1.0.1 
branch into master.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 40 +---
 1 file changed, 25 insertions(+), 15 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/01: debian/changelog: merge changelog from release/4.1.0.1 branch into master.

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 9af7ec4293108ba18ead8793691dcb7758b85006
Author: X2Go Release Manager 
Date:   Thu Sep 14 03:32:10 2017 +0200

debian/changelog: merge changelog from release/4.1.0.1 branch into master.
---
 debian/changelog | 40 +---
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c770c43..c5577bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,8 +76,6 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium
   will fail badly.
 - src/x2goutils.cpp: ensure that add_to_path () also processes the first
   value passed. Fixes startup problems in MacPorts. Fixes: #1093.
-- src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is
-  only available on Linux, so guard new section.
 - res/i18n/x2goclient_et.ts: various fixups for the Estonian translation
   file.
 - res/i18n/x2goclient_*.ts: go the extra mile and fix up translation files
@@ -166,8 +164,6 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: typo fix in log message only.
 - src/sshmasterconnection.cpp: don't leak ssh_session data, free it once
   we're done with it.
-- src/sessionbutton.cpp: only append "XDM@" string to server text if a
-  direct XDMCP session was requested. Issue automatically found by GCC.
 - Makefile: qmake seems to act weird if QMAKE_C(XX)FLAGS starts with a
   space followed by additional non-whitespace characters. Refactor the
   variables a bit to work around this issue.
@@ -198,10 +194,6 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.1.0):
-- Add "direct XDMCP" functionality.
-- Disable sound button on direct RDP and XDMCP sessions.
-  Set for direct XDMCP session autologin=true.
-  Set for direct XDMCP session username=XDM.
 - Interaction with SSH server (for example for changing
   expired password). Fixes: #592.
 - Fixing setting widget style issue in InteractionDialog on
@@ -252,13 +244,6 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium
   command.
   Fixes: #1100
 
-  [ Seth Galitzer ]
-  * New upstream version (4.1.1.0):
-- src/help.cpp: add documentation for the --background option.
-  Part of #1162.
-- {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new
-  --branding option that replaces the seal logo. Fixes: #1162.
-
   [ Walid Moghrabi ]
   * New upstream version (4.1.1.0):
 - {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: let
@@ -267,6 +252,31 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium
 
  -- X2Go Release Manager   Wed, 22 Feb 2017 07:13:10 +0100
 
+x2goclient (4.1.0.1-0x2go1) unstable; urgency=medium
+
+  [ Mihai Moldovan ]
+  * New upstream version (4.1.0.1):
+- src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is
+  only available on Linux, so guard new section.
+- src/sessionbutton.cpp: only append "XDM@" string to server text if a
+  direct XDMCP session was requested. Issue automatically found by GCC.
+
+  [ Oleksandr Shneyder ]
+  * New upstream version (4.1.0.1):
+- Add "direct XDMCP" functionality.
+- Disable sound button on direct RDP and XDMCP sessions.
+  Set for direct XDMCP session autologin=true.
+  Set for direct XDMCP session username=XDM.
+
+  [ Seth Galitzer ]
+  * New upstream version (4.1.0.1):
+- src/help.cpp: add documentation for the --background option.
+  Part of #1162.
+- {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new
+  --branding option that replaces the seal logo. Fixes: #1162.
+
+ -- X2Go Release Manager   Thu, 14 Sep 2017 03:06:33 +0200
+
 x2goclient (4.1.0.0-0x2go1) unstable; urgency=medium
 
   [ Mihai Moldovan ]

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch build-main updated (add03ee -> 5b8b16a)

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch build-main
in repository x2goclient.

  from  add03ee   release 4.1.0.0
  adds  7f2edea   Continue development
  adds  77b0859 - Add "direct XDMCP" functionality.
  adds  8dff29b   src/onmainwindow.cpp: unbreak Windows and OS X builds - 
directRDP is only available on Linux, so guard new section.
  adds  22d5ae2   Disable sound button on direct RDP and XDMCP sessions. 
Set for direct XDMCP session autologin=true. Set for direct XDMCP session 
username=XDM.
  adds  a273082   src/help.cpp: add documentation for the --background 
option. Part of #1162.
  adds  0445179   
{src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new --branding 
option that replaces the seal logo. Fixes: #1162.
  adds  46c2dbd   src/sessionbutton.cpp: only append "XDM@" string to 
server text if a direct XDMCP session was requested.
  adds  5b8b16a   release 4.1.0.1

No new revisions were added by this update.

Summary of changes:
 VERSION   |   2 +-
 debian/changelog  |  25 ++
 man/man1/x2goclient.1 |   5 +-
 src/editconnectiondialog.cpp  |   6 +-
 src/editconnectiondialog.h|   2 +-
 src/help.cpp  |   2 +
 src/onmainwindow.cpp  | 114 +-
 src/onmainwindow.h|   2 +
 src/sessionbutton.cpp |  11 +++
 src/sessionwidget.cpp |  41 +++--
 src/sessionwidget.h   |   3 +-
 src/settingswidget.cpp| 104 ++-
 src/settingswidget.h  |   8 +-
 src/version.h |   2 +-
 x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc |  10 +--
 x2goclient.spec   |   2 +-
 16 files changed, 313 insertions(+), 26 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch release/4.1.0.1 updated (dab4207 -> 5b8b16a)

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch release/4.1.0.1
in repository x2goclient.

  discards  dab4207   release 4.1.0.1
   new  5b8b16a   release 4.1.0.1

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (dab4207)
\
 N -- N -- N   refs/heads/release/4.1.0.1 (5b8b16a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/01: release 4.1.0.1

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.

commit 5b8b16a1cfe3ada2c031c4c0e2502a9575760fda
Author: X2Go Release Manager 
Date:   Thu Sep 14 03:08:18 2017 +0200

release 4.1.0.1
---
 debian/changelog  | 4 ++--
 man/man1/x2goclient.1 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e01239e..f66a0f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
+x2goclient (4.1.0.1-0x2go1) unstable; urgency=medium
 
   [ Mihai Moldovan ]
   * New upstream version (4.1.0.1):
@@ -21,7 +21,7 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
 - {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new
   --branding option that replaces the seal logo. Fixes: #1162.
 
- -- X2Go Release Manager   Wed, 22 Feb 2017 07:13:10 +0100
+ -- X2Go Release Manager   Thu, 14 Sep 2017 03:06:33 +0200
 
 x2goclient (4.1.0.0-0x2go1) unstable; urgency=medium
 
diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index d90a888..e25a316 100644
--- a/man/man1/x2goclient.1
+++ b/man/man1/x2goclient.1
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goclient 1 "Feb 2017" "Version 4.1.0.1" "X2Go Client (Qt4)"
+.TH x2goclient 1 "Sep 2017" "Version 4.1.0.1" "X2Go Client (Qt4)"
 .SH NAME
 x2goclient \- Client application to launch server-side X2Go sessions.
 .SH SYNOPSIS

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/01: release 4.1.0.1

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.

commit dab4207b6031d61b0f2c7b8fe34a0b6e5d9b7663
Author: X2Go Release Manager 
Date:   Thu Sep 14 03:08:18 2017 +0200

release 4.1.0.1
---
 man/man1/x2goclient.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index d90a888..e25a316 100644
--- a/man/man1/x2goclient.1
+++ b/man/man1/x2goclient.1
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goclient 1 "Feb 2017" "Version 4.1.0.1" "X2Go Client (Qt4)"
+.TH x2goclient 1 "Sep 2017" "Version 4.1.0.1" "X2Go Client (Qt4)"
 .SH NAME
 x2goclient \- Client application to launch server-side X2Go sessions.
 .SH SYNOPSIS

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch release/4.1.0.1 updated (46c2dbd -> dab4207)

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch release/4.1.0.1
in repository x2goclient.

  from  46c2dbd   src/sessionbutton.cpp: only append "XDM@" string to 
server text if a direct XDMCP session was requested.
   new  dab4207   release 4.1.0.1

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 man/man1/x2goclient.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 05/06: {src/{help.cpp, onmainwindow.{cpp, h}}, man/man1/x2goclient.1}: add new --branding option that replaces the seal logo. Fixes: #1162.

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.

commit 0445179feb2dffddb80a38b19b085fdfb9b950ac
Author: Seth Galitzer 
Date:   Wed Mar 22 03:00:39 2017 +0100

{src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new 
--branding option that replaces the seal logo. Fixes: #1162.
---
 debian/changelog  |  2 ++
 man/man1/x2goclient.1 |  3 +++
 src/help.cpp  |  1 +
 src/onmainwindow.cpp  | 17 -
 src/onmainwindow.h|  2 ++
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index edb2a45..71b5d28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (4.1.0.1):
 - src/help.cpp: add documentation for the --background option.
   Part of #1162.
+- {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new
+  --branding option that replaces the seal logo. Fixes: #1162.
 
  -- X2Go Release Manager   Wed, 22 Feb 2017 07:13:10 +0100
 
diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index 895e1f0..d90a888 100644
--- a/man/man1/x2goclient.1
+++ b/man/man1/x2goclient.1
@@ -97,6 +97,9 @@ The support information is provided via a simple HTML file. 
Example:
 \*(T<\fB\-\-background=\fR\*(T>
 Use a custom/branded background image (SVG format) for X2Go Client's main 
window (i.e. replace the blue gradient area
 in X2Go Client by some background of your own (business/workgroup/project).
+.TP
+\*(T<\fB\-\-branding=\fR\*(T>
+Use a custom icon (SVG format) for additional branding to replace the default 
in the lower left corner of X2Go Client's main window.
 
 .SH SESSION PROFILE DEFAULTS
 You can set certain defaults for session profiles via command line switches 
using the following options:
diff --git a/src/help.cpp b/src/help.cpp
index c3f6a59..e3cb1de 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -155,6 +155,7 @@ help::params_t help::build_params () {
   ADD_OPT ("--broker-autologin", QT_TRANSLATE_NOOP ("Help", "Enables the use 
of the default SSH key or SSH agent for authentication against an SSH session 
broker. The client's behavior is undefined if this flag is used for non-SSH 
session brokers."));
   ADD_OPT ("--broker-noauth", QT_TRANSLATE_NOOP ("Help", "Does not ask for 
user credentials during session broker authentication. This can be useful if 
you are using an HTTP(S) session broker without authentication. If you run an 
HTTP(S) server without authentication, but with user-specific profiles, then 
put the user name into the broker URL (refer to --broker-url.) The user name 
then will be extracted from the broker URL and be sent to the session broker. 
The client's behavior is undef [...]
   ADD_OPT ("--background=", QT_TRANSLATE_NOOP ("Help", "Use a 
custom/branded background image (SVG format) for X2Go Client's main window."));
+  ADD_OPT ("--branding=", QT_TRANSLATE_NOOP ("Help", "Use a custom 
icon (SVG format) for additional branding to replace the default in the lower 
left corner of X2Go Client's main window."));
 
 # undef NEWLINE
 # undef ADD_OPT
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index ef958b1..eda9f0c 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -360,7 +360,11 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) 
:QMainWindow ( parent )
 pl.setColor ( QPalette::Window, QColor ( 255,255,255,0 ) );
 x2g->setPalette ( pl );
 
-SVGFrame* on=new SVGFrame ( ( QString ) ":/img/svg/onlogo.svg",false,fr );
+if (OnFile.size())
+on=new SVGFrame ( ( QString ) OnFile,false,fr );
+else
+on=new SVGFrame ( ( QString ) ":/img/svg/onlogo.svg",false,fr );
+
 on->setPalette ( pl );
 
 if ( !miniMode )
@@ -7505,6 +7509,17 @@ bool ONMainWindow::parseParameter ( QString param )
 portableDataPath=value;
 return true;
 }
+if (setting == "--branding")
+{
+value = expandHome(value);
+if (! QFile::exists(value))
+{
+printError( param + tr(" (file does not exist)"));
+return false;
+}
+OnFile=value;
+return true;
+}
 
 printError ( param );
 return false;
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index 8ec120f..37b454c 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -672,6 +672,7 @@ private:
 
 IMGFrame* fr;
 SVGFrame *bgFrame;
+SVGFrame *on;
 QLineEdit* uname;
 ClickLineEdit* pass;
 ClickLineEdit* login;
@@ -801,6 +802,7 @@ private:
 
 QString supportMenuFile;
 QString BGFile;
+QString OnFile;
 QString SPixFile;
 
 QString LDAPSndSys;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org

[X2Go-Commits] [x2goclient] 06/06: src/sessionbutton.cpp: only append "XDM@" string to server text if a direct XDMCP session was requested.

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.

commit 46c2dbde92c0162baff8e048700fe3d8d26b6662
Author: Mihai Moldovan 
Date:   Sun Aug 20 05:49:14 2017 +0200

src/sessionbutton.cpp: only append "XDM@" string to server text if a direct 
XDMCP session was requested.

Issue automatically found by GCC.
---
 debian/changelog  | 2 ++
 src/sessionbutton.cpp | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 71b5d28..e01239e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (4.1.0.1):
 - src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is
   only available on Linux, so guard new section.
+- src/sessionbutton.cpp: only append "XDM@" string to server text if a
+  direct XDMCP session was requested. Issue automatically found by GCC.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp
index 26da85f..2f6fb95 100644
--- a/src/sessionbutton.cpp
+++ b/src/sessionbutton.cpp
@@ -462,9 +462,10 @@ void SessionButton::redraw()
 {
 #ifdef Q_OS_LINUX
 if (st->setting()->value ( sid+"/directxdmcp",
-   ( QVariant ) false ).toBool())
+   ( QVariant ) false ).toBool()) {
 directRDP=true;
 server->setText ( "XDM@"+sv );
+}
 #endif
 cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) );
 cmdBox->setCurrentIndex ( XDMCP );

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 04/06: src/help.cpp: add documentation for the --background option. Part of #1162.

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.

commit a2730823b2793b578f6703ad26f7a30fcd895a67
Author: Seth Galitzer 
Date:   Wed Mar 22 00:49:08 2017 +0100

src/help.cpp: add documentation for the --background option. Part of #1162.
---
 debian/changelog | 5 +
 src/help.cpp | 1 +
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c9b60ca..edb2a45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   Set for direct XDMCP session autologin=true.
   Set for direct XDMCP session username=XDM.
 
+  [ Seth Galitzer ]
+  * New upstream version (4.1.0.1):
+- src/help.cpp: add documentation for the --background option.
+  Part of #1162.
+
  -- X2Go Release Manager   Wed, 22 Feb 2017 07:13:10 +0100
 
 x2goclient (4.1.0.0-0x2go1) unstable; urgency=medium
diff --git a/src/help.cpp b/src/help.cpp
index 5c128db..c3f6a59 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -154,6 +154,7 @@ help::params_t help::build_params () {
   ADD_OPT ("--broker-ssh-key=", QT_TRANSLATE_NOOP ("Help", "Sets 
the path to an SSH key to use for authentication against an SSH session broker. 
The client's behavior is undefined if this flag is used for non-SSH session 
brokers."));
   ADD_OPT ("--broker-autologin", QT_TRANSLATE_NOOP ("Help", "Enables the use 
of the default SSH key or SSH agent for authentication against an SSH session 
broker. The client's behavior is undefined if this flag is used for non-SSH 
session brokers."));
   ADD_OPT ("--broker-noauth", QT_TRANSLATE_NOOP ("Help", "Does not ask for 
user credentials during session broker authentication. This can be useful if 
you are using an HTTP(S) session broker without authentication. If you run an 
HTTP(S) server without authentication, but with user-specific profiles, then 
put the user name into the broker URL (refer to --broker-url.) The user name 
then will be extracted from the broker URL and be sent to the session broker. 
The client's behavior is undef [...]
+  ADD_OPT ("--background=", QT_TRANSLATE_NOOP ("Help", "Use a 
custom/branded background image (SVG format) for X2Go Client's main window."));
 
 # undef NEWLINE
 # undef ADD_OPT

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 03/06: Disable sound button on direct RDP and XDMCP sessions. Set for direct XDMCP session autologin=true. Set for direct XDMCP session username=XDM.

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.

commit 22d5ae235889ab5ae7a601e5904bc26797d8f241
Author: Oleksandr Shneyder 
Date:   Sat Feb 25 10:05:17 2017 +0100

Disable sound button on direct RDP and XDMCP sessions. Set for direct XDMCP 
session autologin=true. Set for direct XDMCP session username=XDM.
---
 debian/changelog  |  3 +++
 src/onmainwindow.cpp  | 10 +-
 src/sessionbutton.cpp | 10 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3eefe35..c9b60ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
 - Add "direct XDMCP" functionality.
+- Disable sound button on direct RDP and XDMCP sessions.
+  Set for direct XDMCP session autologin=true.
+  Set for direct XDMCP session username=XDM.
 
  -- X2Go Release Manager   Wed, 22 Feb 2017 07:13:10 +0100
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index fddb0ff..ef958b1 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -2730,6 +2730,12 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* 
session )
 autologin=st->setting()->value (
   sid+"/autologin",
   ( QVariant ) false ).toBool();
+#ifdef Q_OS_LINUX
+if(command =="XDMCP" && st->setting()->value (
+  sid+"/directxdmcp",
+  ( QVariant ) false ).toBool())
+ autologin=true;
+#endif
 krblogin=st->setting()->value (
  sid+"/krblogin",
  ( QVariant ) false ).toBool();
@@ -3469,14 +3475,16 @@ void ONMainWindow::startDirectRDP()
  break;
 }
 proxyCmd= client +" "+params+ grOpt + " -query "+host +" 
:"+QString::number(p) ;
+login->setText(tr("XDM"));
+resumingSession.display=tr("XDMCP");
 }
 else
 {
 x2goDebug<<"starting direct RDP session";
+resumingSession.display=tr("RDP");
 }
 // x2goDebug<<"starting direct session with cmd:"getLastSession()->name();
 resumingSession.crTime=QDateTime::currentDateTime().toString("dd.MM.yy 
HH:mm:ss");
diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp
index c87d8ac..26da85f 100644
--- a/src/sessionbutton.cpp
+++ b/src/sessionbutton.cpp
@@ -449,15 +449,23 @@ void SessionButton::redraw()
 }
 else if ( command =="RDP" )
 {
+#ifdef Q_OS_LINUX
 if (st->setting()->value ( sid+"/directrdp",
( QVariant ) false ).toBool())
 directRDP=true;
+#endif
 cmdpix.load ( par->iconsPath ( "/16x16/rdp.png" ) );
 cmdBox->setCurrentIndex ( RDP );
 command=tr ( "RDP connection" );
 }
 else if ( command =="XDMCP" )
 {
+#ifdef Q_OS_LINUX
+if (st->setting()->value ( sid+"/directxdmcp",
+   ( QVariant ) false ).toBool())
+directRDP=true;
+server->setText ( "XDM@"+sv );
+#endif
 cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) );
 cmdBox->setCurrentIndex ( XDMCP );
 command=tr ( "XDMCP" );
@@ -566,6 +574,8 @@ void SessionButton::redraw()
 
 
 snd=st->setting()->value ( sid+"/sound", ( QVariant ) true ).toBool();
+if(directRDP)
+snd=false;
 if ( snd )
 sound->setText ( tr ( "Enabled" ) );
 else

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch release/4.1.0.1 updated (89adcfe -> 46c2dbd)

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch release/4.1.0.1
in repository x2goclient.

  discards  89adcfe   src/sessionbutton.cpp: only append "XDM@" string to 
server text if a direct XDMCP session was requested.
  discards  fab5c48   
{src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new --branding 
option that replaces the seal logo. Fixes: #1162.
  discards  47fd1b4   src/help.cpp: add documentation for the --background 
option. Part of #1162.
  discards  174bd0a   Disable sound button on direct RDP and XDMCP sessions. 
Set for direct XDMCP session autologin=true. Set for direct XDMCP session 
username=XDM.
  discards  fe558f7   src/onmainwindow.cpp: unbreak Windows and OS X builds - 
directRDP is only available on Linux, so guard new section.
  discards  c7385a6 - Add "direct XDMCP" functionality.
  adds  7f2edea   Continue development
   new  77b0859 - Add "direct XDMCP" functionality.
   new  8dff29b   src/onmainwindow.cpp: unbreak Windows and OS X builds - 
directRDP is only available on Linux, so guard new section.
   new  22d5ae2   Disable sound button on direct RDP and XDMCP sessions. 
Set for direct XDMCP session autologin=true. Set for direct XDMCP session 
username=XDM.
   new  a273082   src/help.cpp: add documentation for the --background 
option. Part of #1162.
   new  0445179   
{src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new --branding 
option that replaces the seal logo. Fixes: #1162.
   new  46c2dbd   src/sessionbutton.cpp: only append "XDM@" string to 
server text if a direct XDMCP session was requested.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (89adcfe)
\
 N -- N -- N   refs/heads/release/4.1.0.1 (46c2dbd)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 VERSION   |  2 +-
 man/man1/x2goclient.1 |  2 +-
 src/version.h |  2 +-
 x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc | 10 +-
 x2goclient.spec   |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 02/06: src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is only available on Linux, so guard new section.

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.

commit 8dff29bbd5e3d600e5ed8c9e866b68eea412f496
Author: Mihai Moldovan 
Date:   Sat Feb 25 04:19:22 2017 +0100

src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is only 
available on Linux, so guard new section.
---
 debian/changelog | 5 +
 src/onmainwindow.cpp | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 43c1ff1..3eefe35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
 
+  [ Mihai Moldovan ]
+  * New upstream version (4.1.0.1):
+- src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is
+  only available on Linux, so guard new section.
+
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):
 - Add "direct XDMCP" functionality.
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 279800c..fddb0ff 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5942,6 +5942,7 @@ void ONMainWindow::handle_xmodmap_error (QProcess &proc) {
 
 void ONMainWindow::slotProxyError ( QProcess::ProcessError err )
 {
+#ifdef Q_OS_LINUX
 if(err==QProcess::FailedToStart && directRDP)
 {
 QString main_text = tr("Failed to start RDP or XMDCP client");
@@ -5949,6 +5950,7 @@ void ONMainWindow::slotProxyError ( 
QProcess::ProcessError err )
 
 show_RichText_ErrorMsgBox (main_text, informative_text);
 }
+#endif
 slotProxyFinished ( -1,QProcess::CrashExit );
 }
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/06: - Add "direct XDMCP" functionality.

2017-09-13 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.

commit 77b0859e8819e38d993f1eb232a37dd2c81ecc47
Author: Oleksandr Shneyder 
Date:   Fri Feb 24 16:46:58 2017 +0100

  - Add "direct XDMCP" functionality.
---
 debian/changelog |   4 +-
 src/editconnectiondialog.cpp |   6 +--
 src/editconnectiondialog.h   |   2 +-
 src/onmainwindow.cpp |  85 ++-
 src/sessionwidget.cpp|  41 ++---
 src/sessionwidget.h  |   3 +-
 src/settingswidget.cpp   | 104 ++-
 src/settingswidget.h |   8 +++-
 8 files changed, 237 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 605a504..43c1ff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development
+  [ Oleksandr Shneyder ]
+  * New upstream version (4.1.0.1):
+- Add "direct XDMCP" functionality.
 
  -- X2Go Release Manager   Wed, 22 Feb 2017 07:13:10 +0100
 
diff --git a/src/editconnectiondialog.cpp b/src/editconnectiondialog.cpp
index d5eb063..df3fe26 100644
--- a/src/editconnectiondialog.cpp
+++ b/src/editconnectiondialog.cpp
@@ -85,7 +85,7 @@ EditConnectionDialog::EditConnectionDialog ( bool newSession, 
QString id, QWidge
 connect ( sessSet,SIGNAL ( nameChanged ( const QString & ) ),this,
   SLOT ( slot_changeCaption ( const QString& ) ) );
 connect ( this,SIGNAL ( accepted() ),this,SLOT ( slot_accepted() ) );
-connect (sessSet, SIGNAL(directRDP(bool)), this, 
SLOT(slot_directRDP(bool)));
+connect (sessSet, SIGNAL(directRDP(bool,bool)), this, 
SLOT(slot_directRDP(bool,bool)));
 
 connect (sessSet,
 SIGNAL(settingsChanged(QString,QString,QString)), otherSet,
@@ -170,11 +170,11 @@ void EditConnectionDialog::slot_default()
 }
 
 #ifdef Q_OS_LINUX
-void EditConnectionDialog::slot_directRDP(bool direct)
+void EditConnectionDialog::slot_directRDP(bool direct, bool isXDMCP)
 {
 fr->setTabEnabled(1,!direct);
 fr->setTabEnabled(3,!direct);
 fr->setTabEnabled(4,!direct);
-otherSet->setDirectRdp(direct);
+otherSet->setDirectRdp(direct, isXDMCP);
 }
 #endif
diff --git a/src/editconnectiondialog.h b/src/editconnectiondialog.h
index 393390f..05a3a9e 100644
--- a/src/editconnectiondialog.h
+++ b/src/editconnectiondialog.h
@@ -65,7 +65,7 @@ private slots:
 void slot_accepted();
 void slot_default();
 #ifdef Q_OS_LINUX
-void slot_directRDP(bool direct);
+void slot_directRDP(bool direct, bool isXDMCP);
 #endif
 };
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 604d25d..279800c 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3235,7 +3235,7 @@ void ONMainWindow::slotSessEnter()
 QString sid=sessionExplorer->getLastSession()->id();
 QString cmd=st->setting()->value ( sid+"/command",
( QVariant ) QString::null 
).toString();
-bool directRDP=(st->setting()->value ( sid+"/directrdp",
+directRDP=(st->setting()->value ( sid+"/directrdp",
( QVariant ) false ).toBool() 
&& cmd == "RDP");
 
 if (cmd =="RDP" && directRDP)
@@ -3244,6 +3244,16 @@ void ONMainWindow::slotSessEnter()
 startSession ( sid );
 return;
 }
+
+directRDP=(st->setting()->value ( sid+"/directxdmcp",
+   ( QVariant ) false ).toBool() 
&& cmd == "RDP");
+
+if (cmd =="XDMCP" && directRDP)
+{
+x2goDebug<<"Starting direct RDP Session from broker";
+startSession ( sid );
+return;
+}
 #endif
 broker->selectUserSession(sessionExplorer->getLastSession()->id());
 config.session=sessionExplorer->getLastSession()->id();
@@ -3313,6 +3323,8 @@ void ONMainWindow::startDirectRDP()
  ( QVariant ) defaultHeight ).toInt();
 int width=st->setting()->value ( sid+"/width",
 ( QVariant ) defaultWidth ).toInt();
+QString sessionType=st->setting()->value ( sid+"/command",
+ ( QVariant ) "").toString();
 
 QString client=st->setting()->value ( sid+"/rdpclient",
  ( QVariant ) "rdesktop").toString();
@@ -3410,6 +3422,58 @@ void ONMainWindow::startDirectRDP()
 }
 proxyCmd= client +" "+params+ grOpt +userOpt+passOpt + "/v:"+host 
+":"+port ;
 }
+if(sessionType=="XDMCP")
+{
+x2goDebug<<"starting direct XDMCP session";
+client=st->setting()->value ( sid+"/xdmcpclient",
+ ( QVariant ) "Xnest").toString();
+params=st->setting()->value ( sid+"/directxdmcpsettings",
+

[X2Go-Commits] [[X2Go Wiki]] page changed: events:start

2017-09-13 Thread wiki-admin 

A page in your DokuWiki was added or changed. Here are the details:

Date: 2017/09/13 07:17
Browser : Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:55.0) Gecko/20100101 
Firefox/55.0
IP-Address  : 109.42.2.22
Hostname: ip-109-42-2-22.web.vodafone.de
Old Revision: https://wiki.x2go.org/doku.php/events:start?rev=1499342777
New Revision: https://wiki.x2go.org/doku.php/events:start
Edit Summary: [2017] H&E changed their name to M&T
User: stefanbaur

@@ -4,9 +4,9 @@
  2017 
 Tentative (not confirmed/no confirmed dates yet):
   * LinuxDay.AT 2017 - 2017-12-02 (yes, DECEMBER) - no CFP yet
   * Linux Expo Ulm 2017 - Date TBD (2017-05-06, maybe? - if at all 
- next opportunity would be in October, as LPD 2017.2 is on 2017-11-18, only 9 days after 
the IT-Kongress, which is just plain impossible for us to handle)
-   * Hobby & Elektronik, Stuttgart, Germany (2017-11-23 - 2017-11-26) - Probably a 
"split" event as last year, with one or two X2Go
volunteers taking turns per day
+   * Modell & Technik Hobby & Elektronik, Stuttgart, Germany (2017-11-23 - 
2017-11-26) - Probably a "split" event as last year, with one or two X2Go volunteers taking turns 
per day
  IT-Kongress 2017, Neu-Ulm, Germany (2017-11-09) 
   * As one of the X2Go core team members is on the planning committee, we'll 
have a small booth again, as in the previous years
   * This year's talk will be about the new X2Go-TCE-Live and might feature 
Hans Bonfigt as co-presenter
   * Booth staff should arrive at 07:00 CET


--
This mail was generated by DokuWiki at
https://wiki.x2go.org/

___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits