rpms/openoffice.org/devel openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch, 1.2, 1.3

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10124

Modified Files:
	openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch 
Log Message:
focus race foo

openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch:

Index: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch	20 Oct 2008 15:37:46 -0000	1.2
+++ openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch	5 Nov 2008 11:19:02 -0000	1.3
@@ -89,3 +89,13 @@
              if( isFloatGrabWindow() )
              {
                  m_nFloats++;
+@@ -1950,7 +2007,8 @@
+             if( ! (nFlags & SAL_FRAME_TOTOP_GRABFOCUS_ONLY) )
+                 gtk_window_present( GTK_WINDOW(m_pWindow) );
+             else
+-                gdk_window_focus( m_pWindow->window, GDK_CURRENT_TIME );
++                gdk_window_focus( m_pWindow->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window) );
++
+             /*  need to do an XSetInputFocus here because
+              *  gdk_window_focus will ask a EWMH compliant WM to put the focus
+              *  to our window - which it of course won't since our input hint