x2goclient.git - master (branch) updated: 3.99.0.3-1-gd71fc2f - x2go-commits

18 Jan 2012

The branch, master has been updated
       via  d71fc2fcfd9af5e6638df881b2ed040a08492949 (commit)
      from  1098f511f85416cc723c64a602fac381d7d215ba (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 d71fc2fcfd9af5e6638df881b2ed040a08492949
Author: Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de>
Date:   Wed Jan 18 13:22:48 2012 +0100

    Enabled support for Xinerama

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

Summary of changes:
 debian/changelog       |    2 ++
 onmainwindow_part4.cpp |    4 ++--
 settingswidget.cpp     |    3 ---
 3 files changed, 4 insertions(+), 5 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 460386e..990652b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low
     - Multi-display support: support for xinerama (temporarily disabled--support
       in x2goagent needed)
     - Add -lXpm in project file.
+  * Enabled support for Xinerama
+
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Tue, 27 Dec 2011 16:17:46 +0100
 
diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp
index 5d8eecd..52b381d 100644
--- a/onmainwindow_part4.cpp
+++ b/onmainwindow_part4.cpp
@@ -1148,11 +1148,11 @@ void ONMainWindow::slotXineramaConfigured()
     else
         xinSizeInc=-1;
 #ifdef Q_OS_LINUX
+    lastDisplayGeometry.setWidth(lastDisplayGeometry.width()+xinSizeInc);
     XSync(QX11Info::display(),false);
     XResizeWindow(QX11Info::display(), proxyWinId,
-                  lastDisplayGeometry.width()+xinSizeInc,lastDisplayGeometry.height());
+                  lastDisplayGeometry.width(),lastDisplayGeometry.height());
     XSync(QX11Info::display(),false);
-    lastDisplayGeometry=proxyWinGeometry();
 #endif
 #ifdef Q_OS_WIN
     QRect geom;
diff --git a/settingswidget.cpp b/settingswidget.cpp
index 86c5395..1d1a229 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -270,9 +270,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
     kbd->setChecked ( true );
     custom->setChecked ( true );
     readConfig();
-    
-    cbXinerama->setVisible(false);
-    cbXinerama->setChecked(false);
 }
 
 


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

    