rpms/openoffice.org/FC-5 openoffice.org-2.0.4.ooo63086.vcl.focusfollowsmouse.patch, NONE, 1.1 openoffice.org.spec, 1.681, 1.682

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15910

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo63086.vcl.focusfollowsmouse.patch 
Log Message:
openoffice.org-2.0.4.ooo63086.vcl.focusfollowsmouse.patch

openoffice.org-2.0.4.ooo63086.vcl.focusfollowsmouse.patch:
 gtkframe.cxx |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

--- NEW FILE openoffice.org-2.0.4.ooo63086.vcl.focusfollowsmouse.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.42
retrieving revision 1.42.88.1
diff -u -r1.42 -r1.42.88.1
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	25 Jan 2006 11:40:22 -0000	1.42
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	16 Mar 2006 12:28:08 -0000	1.42.88.1
@@ -1005,6 +1005,20 @@
             if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea )
                 getDisplay()->getWMAdaptor()->switchToWorkArea( m_pParent->m_nWorkArea );
             
+            if( isFloatGrabWindow() &&
+                m_pParent &&
+                m_nFloats == 0 &&
+                ! getDisplay()->GetCaptureFrame() )
+            {
+                /* #i63086#
+                 * outsmart Metacity's "focus:mouse" mode
+                 * which insists on taking the focus from the document
+                 * to the new float. Grab focus to parent frame BEFORE
+                 * showing the float (cannot grab it to the float
+                 * before show).
+                 */
+                 m_pParent->grabPointer( TRUE, TRUE );
+            }
             gtk_widget_show( GTK_WIDGET(m_pWindow) );
             if( isFloatGrabWindow() )
             {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -r1.681 -r1.682
--- openoffice.org.spec	27 Sep 2006 08:28:29 -0000	1.681
+++ openoffice.org.spec	27 Sep 2006 09:17:35 -0000	1.682
@@ -185,6 +185,7 @@
 Patch57: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 Patch58: openoffice.org-2.0.4.ooo69213.xmlhelp.db4.patch
 Patch59: openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch
+Patch60: openoffice.org-2.0.4.ooo63086.vcl.focusfollowsmouse.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -853,6 +854,7 @@
 %patch57 -p1 -b .ooo67740.xmlhelp.doublefree.patch
 %patch58 -p1 -b .ooo69213.xmlhelp.db4.patch
 %patch59 -p1 -b .ooo69236.slideshow.esccrash.patch
+%patch60 -p1 -b .ooo63086.vcl.focusfollowsmouse.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3300,6 +3302,7 @@
 %changelog
 - Wed Sep 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.19
 - add openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch for rh#206177#
+- add openoffice.org-2.0.4.ooo63086.vcl.focusfollowsmouse.patch for rh#206051#
 
 * Tue Sep 05 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.18
 - add openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch