rpms/openoffice.org/devel openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch, 1.3, 1.4
Caolan McNamara
caolanm at fedoraproject.org
Fri Nov 7 11:45:41 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15641
Modified Files:
openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
Log Message:
flaming death to window managers
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch 5 Nov 2008 11:19:02 -0000 1.3
+++ openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch 7 Nov 2008 11:45:09 -0000 1.4
@@ -24,20 +24,7 @@
g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
// force wm class hint
-@@ -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 );
-diff -ru vcl/unx/gtk.orig/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
---- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 2008-10-14 12:47:44.000000000 +0100
-+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 2008-10-20 16:32:49.000000000 +0100
-@@ -791,6 +791,7 @@
+@@ -788,6 +791,7 @@
{
eType = GDK_WINDOW_TYPE_HINT_UTILITY;
gtk_window_set_skip_taskbar_hint( GTK_WINDOW(m_pWindow), true );
@@ -45,16 +32,31 @@
}
else if( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
{
-@@ -827,7 +826,7 @@
+@@ -817,11 +821,22 @@
+
+ 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 );
- if( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
-+ if( ( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) || ( (nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) ) )
++ if(
++ (
++ ( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) ||
++ ( (nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) )
++ ) &&
++ getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("Metacity")
++ )
++ {
lcl_set_accept_focus( GTK_WINDOW(m_pWindow), FALSE, false );
++ }
}
-@@ -1282,7 +1281,34 @@
+ }
+@@ -1275,7 +1290,34 @@
*/
m_pParent->grabPointer( TRUE, TRUE );
}
@@ -89,7 +91,7 @@
if( isFloatGrabWindow() )
{
m_nFloats++;
-@@ -1950,7 +2007,8 @@
+@@ -1961,7 +2004,8 @@
if( ! (nFlags & SAL_FRAME_TOTOP_GRABFOCUS_ONLY) )
gtk_window_present( GTK_WINDOW(m_pWindow) );
else
More information about the fedora-extras-commits
mailing list