[X2go-Commits] x2goclient.git - build-main (branch) updated: 3.99.0.4

X2go dev team git-admin at x2go.org
Wed Jan 18 14:54:13 CET 2012


The branch, build-main has been updated
       via  1d1c2551d31b7f579e0596f43571da7dfa34c17b (commit)
       via  0589f7af52d4e8182b119fa598513d98203d708a (commit)
       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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                    |    2 +-
 debian/changelog           |   10 +++++++++-
 desktop/x2goclient.desktop |    2 +-
 onmainwindow_part4.cpp     |    4 ++--
 settingswidget.cpp         |    3 ---
 version.h                  |    2 +-
 x2goplugin.rc              |   12 ++++++------
 7 files changed, 20 insertions(+), 15 deletions(-)

The diff of changes is:
diff --git a/VERSION b/VERSION
index d2b4138..7e58983 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.99.0.3
+3.99.0.4
diff --git a/debian/changelog b/debian/changelog
index 460386e..60c4563 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x2goclient (3.99.0.4-0~x2go1) unstable; urgency=low
+
+  [ Oleksandr Shneyder ]
+  * New upstream version (3.99.0.4):
+    - Enabled support for Xinerama
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 18 Jan 2012 14:53:20 +0100
+
 x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low
 
   [ Mike Gabriel ]
@@ -21,7 +29,7 @@ x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low
       in x2goagent needed)
     - Add -lXpm in project file.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 27 Dec 2011 16:17:46 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 18 Jan 2012 14:50:31 +0100
 
 x2goclient (3.99.0.2-0~x2go1) unstable; urgency=low
 
diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop
index 918a344..5cc4280 100644
--- a/desktop/x2goclient.desktop
+++ b/desktop/x2goclient.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=3.99.0.3
+Version=3.99.0.4
 Type=Application
 Name=X2Go Client
 Exec=/usr/bin/x2goclient
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);
 }
 
 
diff --git a/version.h b/version.h
index d74ef6a..6e5c5e0 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "3.99.0.3"
+#define VERSION "3.99.0.4"
diff --git a/x2goplugin.rc b/x2goplugin.rc
index 1079f6d..05ee2b0 100644
--- a/x2goplugin.rc
+++ b/x2goplugin.rc
@@ -1,8 +1,8 @@
 1 TYPELIB "x2goplugin.rc"
 
 1 VERSIONINFO
- FILEVERSION 3,99,0,3
- PRODUCTVERSION 3,99,0,3
+ FILEVERSION 3,99,0,4
+ PRODUCTVERSION 3,99,0,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,13 +21,13 @@ BEGIN
             VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0"
 	    VALUE "FileExtents", "x2go\0"
 	    VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0"
-            VALUE "FileVersion", "3, 99, 0 ,3\0"
+            VALUE "FileVersion", "3, 99, 0 ,4\0"
             VALUE "InternalName", "x2goplugin\0"
-            VALUE "LegalCopyright", "Copyright © 2010 Obviously Nice\0"
+            VALUE "LegalCopyright", "Copyright © 2010-2012 Obviously Nice\0"
 	    VALUE "MIMEType", "application/x2go\0"
             VALUE "OriginalFilename", "npx2goplugin.dll\0"
-            VALUE "ProductName", "X2GoClient Plug-in 3.99.0.3\0"
-            VALUE "ProductVersion", "3, 99, 0, 3\0"
+            VALUE "ProductName", "X2GoClient Plug-in 3.99.0.4\0"
+            VALUE "ProductVersion", "3, 99, 0, 4\0"
         END
     END
     BLOCK "VarFileInfo"


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