rpms/openoffice.org/devel openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch, NONE, 1.1 openoffice.org.spec, 1.1638, 1.1639 openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch, 1.2, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch 
Removed Files:
	openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch 
Log Message:
fix the annoying float behaviour as well

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

--- NEW FILE openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.72.8.2
diff -u -r1.72.8.2 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	23 Jan 2008 17:17:10 -0000	1.72.8.2
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	4 Sep 2008 17:21:25 -0000
@@ -745,6 +745,9 @@
     m_aForeignTopLevelWindow = None;
     m_nStyle = nStyle;
 
+    GtkWindowType eWinType = ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION))
+        ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
+
     if( nStyle & SAL_FRAME_STYLE_SYSTEMCHILD )
     {
         m_pWindow = gtk_event_box_new();
@@ -757,7 +760,7 @@
         }
     }
     else
-        m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL );
+        m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType, "visible", FALSE, NULL );
 	g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
 
     // force wm class hint
@@ -806,7 +809,8 @@
             gtk_window_set_decorated( GTK_WINDOW(m_pWindow), FALSE );
         gtk_window_set_gravity( GTK_WINDOW(m_pWindow), GDK_GRAVITY_STATIC );
         if( m_pParent && ! (m_pParent->m_nStyle & SAL_FRAME_STYLE_PLUG) )
-            gtk_window_set_transient_for( GTK_WINDOW(m_pWindow), GTK_WINDOW(m_pParent->m_pWindow) );
+            if ((eType != GDK_WINDOW_TYPE_HINT_UTILITY) && (eType != GDK_WINDOW_TYPE_HINT_TOOLBAR))
+                gtk_window_set_transient_for( GTK_WINDOW(m_pWindow), GTK_WINDOW(m_pParent->m_pWindow) );
     }
     else if( (nStyle & SAL_FRAME_STYLE_FLOAT) )
     {
@@ -817,6 +821,9 @@
 
     InitCommon();
 
+    if (eWinType == GTK_WINDOW_TOPLEVEL)
+        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
+
     if( bDecoHandling )
     {
         gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1638
retrieving revision 1.1639
diff -u -r1.1638 -r1.1639
--- openoffice.org.spec	4 Sep 2008 17:27:15 -0000	1.1638
+++ openoffice.org.spec	5 Sep 2008 11:57:24 -0000	1.1639
@@ -112,7 +112,7 @@
 Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 Patch43: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 Patch44: openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
-Patch45: openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch
+Patch45: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1296,7 +1296,7 @@
 %patch42 -p1 -b .ooo93366.fpicker_in_main.patch
 %patch43 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
 %patch44 -p1 -b .oooXXXXX.filter.latex.patch
-%patch45 -p1 -b .oooXXXXX.vcl.jrb-frames.patch
+%patch45 -p1 -b .ooo93515.vcl.jrb-frames.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3658,7 +3658,7 @@
 - defuzz patches
 - add openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 - add openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
-- add openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch to get better
+- add openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch to get better
   focus for new frames when already running and behind in stacking order
 
 * Fri Aug 29 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-4.1


--- openoffice.org-3.0.0.oooXXXXX.vcl.jrb-frames.patch DELETED ---