rpms/openoffice.org/devel openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch, 1.4, 1.5 openoffice.org.spec, 1.1732, 1.1733

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch 
	openoffice.org.spec 
Log Message:
Workaround: rhbz#477174 where gdk_x11_get_server_time now hangs for us

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch	7 Nov 2008 11:45:09 -0000	1.4
+++ openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch	20 Dec 2008 17:05:21 -0000	1.5
@@ -37,7 +37,7 @@
      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));
++        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, GDK_CURRENT_TIME);
 +
      if( bDecoHandling )
      {
@@ -84,7 +84,7 @@
 +            // awesome.
 +
 +            if( m_pParent && ( ( (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) || ( (m_nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) ) ) )
-+                gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
++                gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, GDK_CURRENT_TIME);
 +
              gtk_widget_show( m_pWindow );
 +
@@ -96,7 +96,7 @@
                  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) );
++                gdk_window_focus( m_pWindow->window, GDK_CURRENT_TIME );
 +
              /*  need to do an XSetInputFocus here because
               *  gdk_window_focus will ask a EWMH compliant WM to put the focus


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1732
retrieving revision 1.1733
diff -u -r1.1732 -r1.1733
--- openoffice.org.spec	19 Dec 2008 13:12:41 -0000	1.1732
+++ openoffice.org.spec	20 Dec 2008 17:05:21 -0000	1.1733
@@ -3798,7 +3798,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Dec 18 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-14.1
+* Sat Dec 19 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-14.1
 - next milestone
 - Resolves: rhbz#475007 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 - add ga thesaurus
@@ -3809,6 +3809,7 @@
 - Resolves: rhbz#474719 openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
 - drop integrated workspace.sjfixes12.patch
 - drop integrated workspace.swffixes02.patch
+- Workaround: rhbz#477174 where gdk_x11_get_server_time now hangs for us
 
 * Thu Dec 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.2
 - Resolves: rhbz#466680 package OGLTrans 3D OpenGL slide transitions