Message-ID: <20121203100548.44381avqctyqodbg@mail.das-netzwerkteam.de>
Date: Mon, 03 Dec 2012 10:05:48 +0100
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
To: submit@bugs.x2go.org
Subject: X2Go Client: some of the debug code fails to compile
MIME-Version: 1.0
Content-Type: multipart/signed;
 boundary="=_183rrtjrjrzg";
 protocol="application/pgp-signature";
 micalg="pgp-sha1"
Content-Transfer-Encoding: 7bit
User-Agent: Internet Messaging Program (IMP) H3 (4.3.4)

This message is in MIME format and has been PGP signed.

--=_183rrtjrjrzg
Content-Type: text/plain;
 charset=UTF-8;
 DelSp="Yes";
 format="flowed"
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Package: x2goclient
Severity: minor
Version: HEAD

Hi Alex,

some of the debug code lines fail to compile if a LOG_FILE has been set.

The below patch shows which lines I had to comment out to make X2Go  
Client compile with debug output.

Greets,
Mike


diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 76f8ba9..1f2e2b7 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -261,7 +261,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent )  
:QMainWindow ( parent )

      QDesktopWidget wd;

-    x2goDebug<<"primary screen geometry:  
"<<wd.screenGeometry(wd.screenNumber(this));
+    //x2goDebug<<"primary screen geometry:  
"<<wd.screenGeometry(wd.screenNumber(this));

      if ( wd.screenGeometry(wd.screenNumber(this)).width() <1024 ||
              wd.screenGeometry(wd.screenNumber(this)).height() <768 )
@@ -9375,7 +9375,7 @@ void ONMainWindow::slotSetProxyWinFullscreen()
  void ONMainWindow::resizeProxyWinOnDisplay(int disp)
  {
      QRect geom=QApplication::desktop()->screenGeometry(disp-1);
-    x2goDebug<<"resizing proxy win to fit display  
"<<disp<<"("<<geom<<")"<<endl;
+    //x2goDebug<<"resizing proxy win to fit display  
"<<disp<<"("<<geom<<")"<<endl;
  #ifdef Q_OS_LINUX
      XSync(QX11Info::display(),false);
      XMoveWindow(QX11Info::display(), proxyWinId,geom.x(),geom.y());
@@ -9425,7 +9425,7 @@ void ONMainWindow::slotConfigXinerama()
      if (newGeometry==lastDisplayGeometry)
          return;
      lastDisplayGeometry=newGeometry;
-    x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl;
+//    x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl;
      QDesktopWidget* root=QApplication::desktop();
      QList<QRect> newXineramaScreens;
      for (int i=0; i< root->numScreens(); ++i)
@@ -9437,17 +9437,17 @@ void ONMainWindow::slotConfigXinerama()
               
intersection=root->screenGeometry(i).intersected(lastDisplayGeometry);
          if (!intersection.isNull())
          {
-            x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl;
+//            x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl;
              intersection.moveLeft(intersection.x()-lastDisplayGeometry.x());
              intersection.moveTop(intersection.y()-lastDisplayGeometry.y());
-            x2goDebug<<"xinerama screen: "<<intersection<<endl;
+//            x2goDebug<<"xinerama screen: "<<intersection<<endl;
              newXineramaScreens<<intersection;
          }
      }
      if (xineramaScreens != newXineramaScreens)
      {
          xineramaScreens=newXineramaScreens;
-        x2goDebug<<"xinerama screen changed, new screens:  
"<<xineramaScreens<<endl;
+//        x2goDebug<<"xinerama screen changed, new screens:  
"<<xineramaScreens<<endl;
          xineramaTimer->stop();
          QStringList screens;
          foreach (QRect disp, xineramaScreens)

-- 

DAS-NETZWERKTEAM
mike gabriel, rothenstein 5, 24214 neudorf-bornstein
fon: +49 (1520) 1976 148

GnuPG Key ID 0x25771B31
mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb

--=_183rrtjrjrzg
Content-Type: application/pgp-signature
Content-Description: Digitale PGP-Unterschrift
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQIcBAABAgAGBQJQvGtsAAoJEJr0azAldxsxl1cQALRWe9W6u8koNe8nVBcJWrHa
i31JHg7f2KnwKZU73N5clCNwZlPANfeAmla4c/B579x0q8X8tUlbIW5v+Hwa+MRA
2orAh73/i5i8YKFFz0U99gp1vgvBZz9IwmWQDlw9u1UAW79DuqL2HCF7uMIkGRUr
TpxbIeHuPwc1pkxUKLD1LDOxwz33lmAUT1Em4pYh/KDm3hlmw0YpO8e6RcsDGiJA
1DFSKLelxJPNUbJlzSYRi/vuHeljAAVDsgUbgf0P82lMZp5t3XWzE5MurcoYu8Wi
YEwPWHSOz56sHVmoqCrCpe2ux03On84PIU3TMMGoT1iefZKYhzpGfZPl9iedmrHr
airBEuIujDTeZMopw0lOZRp1y/Es7g5zXQFROIfWAyN2TbFA9t9079HBSa0kgQUL
/mjthqL8IYv3gkTu8DF2RLIERIhqN3cdgLFMbyKDhq9pvQ4UoF1ODbL6tQucjf4M
1i4ndwV5J76Ljnox8nYcddSDMvVcuqkDQkb4Dq0AIkfMWaLMxP4KznwbRGkksvph
XF3Z21pd47UO2izIRuaQ8dM4dM34jKUVNrti5lvT6frOHyQW+XDGE6DrQhe56Q9q
EPZizjBlYUGbbnrhxvRG3WswTX8gbulbO8AYTLqSBqz+haBVm2tWCgN3Op9SIKTF
5m/Ydkf1PPMJdxuE6ELM
=oLl3
-----END PGP SIGNATURE-----

--=_183rrtjrjrzg--