[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.2.1-6-gd4d0fe3

[X2Go dev team]

The branch, master has been updated
       via  d4d0fe38610d3e514dc2e4e259ce8f103e4ac535 (commit)
      from  647ab75f420637994b0cc400590adedd106e0c28 (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 d4d0fe38610d3e514dc2e4e259ce8f103e4ac535
Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
Date:   Thu Jul 5 13:29:48 2012 +0200

    Fixing X2Go Plugin

-----------------------------------------------------------------------

Summary of changes:
 config_linux_plugin.sh |    2 +
 debian/changelog       |    4 +++
 onmainwindow.cpp       |   69 ++++++++++++++++++++++++++---------------------
 3 files changed, 44 insertions(+), 31 deletions(-)

The diff of changes is:
diff --git a/config_linux_plugin.sh b/config_linux_plugin.sh
index 6081d51..d33a481 100755
--- a/config_linux_plugin.sh
+++ b/config_linux_plugin.sh
@@ -2,4 +2,6 @@
 
 make distclean
 
+lrelease x2goclient.pro
+
 X2GO_CLIENT_TARGET=plugin qmake-qt4
diff --git a/debian/changelog b/debian/changelog
index 3490eb6..27b94f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * New upstream version (3.99.2.2):
     - Drop Encoding key from .desktop file (as it is deprecated
       according to latest FreeDesktop.org specs).
@@ -9,6 +10,9 @@ x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low
     - Provide CPPFLAGS for QMAKE_CFLAGS _and_ QMAKE_CXXFLAGS. Provide them as
       first build parameters.
 
+  [ Oleksandr Shneyder ]
+  * Fixing X2Go Plugin
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 08 Jun 2012 23:17:02 +0200
 
 x2goclient (3.99.2.1-0~x2go1) unstable; urgency=low
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index a85e37f..f68696a 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -382,6 +382,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
 #if defined(CFGPLUGIN) && defined(Q_OS_LINUX)
     x2goDebug<<"create embedContainer"<<endl;
     embedContainer=new QX11EmbedContainer ( fr );
+
 #endif
     if ( !embedMode )
     {
@@ -7723,7 +7724,7 @@ QString ONMainWindow::getXDisplay()
             }
             else
             {
-              return (xsocket);
+                return (xsocket);
             }
         }
     }
@@ -8944,6 +8945,8 @@ void ONMainWindow::startSshd()
 
 void ONMainWindow::setProxyWinTitle()
 {
+  if(embedMode)
+    return;
 
     QString title;
 
@@ -9161,45 +9164,49 @@ void ONMainWindow::slotFindProxyWin()
         x2goDebug<<"proxy win found:"<<proxyWinId;
         setProxyWinTitle();
         proxyWinTimer->stop();
-        if (!useLdap)
+        if (!embedMode)
         {
-            X2goSettings *st;
-            QString sid;
-            if ( !embedMode )
-                sid=lastSession->id();
-            else
-                sid="embedded";
-
-            if (brokerMode)
-                st=new X2goSettings(config.iniFile,QSettings::IniFormat);
-            else
-                st= new X2goSettings( "sessions" );
-            uint displays=QApplication::desktop()->numScreens();
-            xinerama=st->setting()->value ( sid+"/xinerama",
-                                            ( QVariant ) defaultXinerama ).toBool();
-            if (st->setting()->value ( sid+"/multidisp",
-                                       ( QVariant ) false ).toBool())
+            if (!useLdap)
             {
-                uint disp=st->setting()->value ( sid+"/display",
-                                                 ( QVariant ) 1 ).toUInt();
-                if (disp>displays)
+                X2goSettings *st;
+                QString sid;
+                if ( !embedMode )
+                    sid=lastSession->id();
+                else
+                    sid="embedded";
+
+                if (brokerMode)
+                    st=new X2goSettings(config.iniFile,QSettings::IniFormat);
+                else
+                    st= new X2goSettings( "sessions" );
+                uint displays=QApplication::desktop()->numScreens();
+                xinerama=st->setting()->value ( sid+"/xinerama",
+                                                ( QVariant ) defaultXinerama ).toBool();
+                if (st->setting()->value ( sid+"/multidisp",
+                                           ( QVariant ) false ).toBool())
                 {
-                    disp=1;
+                    uint disp=st->setting()->value ( sid+"/display",
+                                                     ( QVariant ) 1 ).toUInt();
+                    if (disp>displays)
+                    {
+                        disp=1;
+                    }
+                    resizeProxyWinOnDisplay(disp);
+                    return;
                 }
-                resizeProxyWinOnDisplay(disp);
-                return;
             }
-        }
-        if (xinerama)
-        {
-            x2goDebug<<"Starting xinerama timer\n";
-            lastDisplayGeometry=QRect();
-            xineramaScreens.clear();
-            xineramaTimer->start(500);
+            if (xinerama)
+            {
+                x2goDebug<<"Starting xinerama timer\n";
+                lastDisplayGeometry=QRect();
+                xineramaScreens.clear();
+                xineramaTimer->start(500);
+            }
         }
 
         if ( embedMode )
         {
+            x2goDebug<<"checking rootless config";
             if ( config.rootless )
             {
                 x2goDebug<<"win is rootless";


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