[X2Go-Commits] x2goclient.git - build-baikal (branch) updated: 4.0.1.1-6-g56785cb

X2Go dev team git-admin at x2go.org
Wed Jan 8 22:20:04 CET 2014


The branch, build-baikal has been updated
       via  56785cbc26c68ff4704b347add58ea559956aa5f (commit)
      from  2fd089264b743449013522b386e7fc8086a552ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 config_linux_static_plugin.sh |    4 +++-
 debian/changelog              |    6 ++++++
 onmainwindow.cpp              |   25 +++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/config_linux_static_plugin.sh b/config_linux_static_plugin.sh
index 4776a3c..f5efaf2 100755
--- a/config_linux_static_plugin.sh
+++ b/config_linux_static_plugin.sh
@@ -2,5 +2,7 @@
 
 make distclean
 
+lrelease x2goclient.pro
+
 export X2GO_LINUX_STATIC=x2go_linux_static
-X2GO_CLIENT_TARGET=plugin /usr/local/Trolltech/Qt-4.7.1/bin/qmake -config release -spec linux-g++
+X2GO_CLIENT_TARGET=plugin /usr/local/Trolltech/Qt-4.8.5/bin/qmake -config release -spec linux-g++
diff --git a/debian/changelog b/debian/changelog
index 1af832e..9075947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * New upstream version (4.0.1.2):
     + Provide Keywords: key in .desktop file.
   * Pull-in packaging changes from Debian.
 
+  [ Oleksandr Shneyder ]
+  * New upstream version (4.0.1.2):
+    - support for keys "shadowuser" "shadowdisplay" and "shadowmode" in
+      config file. This allow to choose default display for shadow sessions
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 11 Sep 2013 12:17:43 +0200
 
 x2goclient (4.0.1.1-0~x2go1) unstable; urgency=low
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index e77360f..6a3fb66 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -4339,6 +4339,31 @@ void ONMainWindow::selectSession ( QStringList& sessions )
         filterDesktops ( "" );
         desktopFilter->setFocus();
         desktopFilter->selectAll();
+        if ( !embedMode )
+        {
+            X2goSettings* st;
+
+            if (!brokerMode)
+            {
+                st=new X2goSettings( "sessions" );
+
+                QString sid=lastSession->id();
+                QString suser = st->setting()->value(sid + "/shadowuser", (QVariant) QString::null).toString();
+                QString sdisplay = st->setting()->value(sid + "/shadowdisplay", (QVariant) QString::null).toString();
+                bool fullAccess= st->setting()->value(sid + "/shadowfullaccess", (QVariant) false).toBool();
+                if(suser != QString::null && sdisplay != QString::null)
+                {
+                    shadowUser=suser;
+                    shadowDisplay=sdisplay;
+                    if(fullAccess)
+                        shadowMode=SHADOW_FULL;
+                    else
+                        shadowMode=SHADOW_VIEWONLY;
+                    startNewSession();
+		    return;
+                }
+            }
+        }
     }
 
     sessTv->setCurrentIndex ( sessTv->model()->index ( 0, 0 ) );


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).




More information about the x2go-commits mailing list