ekiga r6969 - in trunk: . lib/gui src/gui

[mschneid svn gnome org]

Author: mschneid
Date: Sun Sep 14 14:38:10 2008
New Revision: 6969
URL: http://svn.gnome.org/viewvc/ekiga?rev=6969&view=rev

Log:
Possibly solve the BadWindow issue.


Modified:
   trunk/ChangeLog
   trunk/lib/gui/xwindow.cpp
   trunk/src/gui/main.cpp

Modified: trunk/lib/gui/xwindow.cpp
==============================================================================
--- trunk/lib/gui/xwindow.cpp	(original)
+++ trunk/lib/gui/xwindow.cpp	Sun Sep 14 14:38:10 2008
@@ -464,7 +464,7 @@
 XWindow::Sync()
 {
   XLockDisplay(_display);
-  XSync (_display, false);
+  XSync (_display, False);
   XUnlockDisplay(_display);
 }
 
@@ -547,7 +547,7 @@
   XLockDisplay (_display);
   XMapRaised (_display, _XWindow);
   XRaiseWindow (_display, _XWindow);
-  XFlush (_display);
+  XSync (_display, False);
   XUnlockDisplay (_display);
 
   _state.fullscreen = !_state.fullscreen;
@@ -606,7 +606,7 @@
   SetDecoration (false);
 
   XLockDisplay (_display);
-  XSync (_display,false); 
+  XSync (_display, False); 
   XGetGeometry (_display, _XWindow, &root, &oldx, &oldy, windowWidth, windowHeight, &ud, &ud);
   XTranslateCoordinates (_display, _XWindow, root, oldx, oldy, x, y, &_dw);
   XUnlockDisplay (_display);
@@ -635,7 +635,7 @@
   XA_NET_WM_STATE_STAYS_ON_TOP = XInternAtom (_display, "_NET_WM_STATE_STAYS_ON_TOP", False);
   XA_NET_WM_STATE_BELOW = XInternAtom (_display, "_NET_WM_STATE_BELOW", False);
 
-  XSync (_display, false);
+  XSync (_display, False);
 
   if (!checkDepth()) 
     return false;

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Sun Sep 14 14:38:10 2008
@@ -1053,8 +1053,8 @@
   gtk_widget_size_request (GTK_WIDGET (mw->main_video_image), &req);
   gtk_window_get_size (GTK_WINDOW (self), &x, &y);
   gtk_widget_set_size_request (GTK_WIDGET (mw->main_video_image), width, height);
-  gtk_window_resize (GTK_WINDOW (self), x + (width - req.width), y + (height - req.height));
-
+  gtk_window_resize (GTK_WINDOW (self), width, height);
+  
   GdkRectangle rect;
   rect.x = mw->main_video_image->allocation.x;
   rect.y = mw->main_video_image->allocation.y;