rpms/openoffice.org/devel workspace.vcl98.patch, 1.5, 1.6 openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch, 1.6, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	workspace.vcl98.patch 
Removed Files:
	openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch 
Log Message:
remove workarounds

workspace.vcl98.patch:

Index: workspace.vcl98.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl98.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- workspace.vcl98.patch	16 Jan 2009 10:18:11 -0000	1.5
+++ workspace.vcl98.patch	2 Feb 2009 15:24:49 -0000	1.6
@@ -221,7 +221,7 @@
      InitCommon();
  
 +    if (eWinType == GTK_WINDOW_TOPLEVEL)
-+        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, safe_gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
++        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
 +
      if( bDecoHandling )
      {
@@ -268,7 +268,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, safe_gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
++                gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
 +
              gtk_widget_show( m_pWindow );
 +
@@ -280,46 +280,8 @@
                  gtk_window_present( GTK_WINDOW(m_pWindow) );
              else
 -                gdk_window_focus( m_pWindow->window, GDK_CURRENT_TIME );
-+                gdk_window_focus( m_pWindow->window, safe_gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window) );
++                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
-@@ -3586,3 +3654,22 @@
- 
-     return FALSE;
- }
-+
-+guint32 GtkSalFrame::safe_gdk_x11_get_server_time(GdkWindow *window)
-+{
-+    static bool bSyncing = getenv("SAL_SYNCHRONIZE");
-+
-+    Display *pDisplay = NULL;
-+    if (!bSyncing)
-+    {
-+        pDisplay = GDK_DISPLAY_XDISPLAY( getGdkDisplay() );
-+        XSynchronize(pDisplay, true);
-+    }
-+
-+    guint32 nRet = gdk_x11_get_server_time(window);
-+
-+    if (!bSyncing)
-+        XSynchronize(pDisplay, false);
-+
-+    return nRet;
-+}
-Index: unx/inc/plugins/gtk/gtkframe.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx,v
-retrieving revision 1.35
-diff -u -r1.35 gtkframe.hxx
---- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx	30 May 2008 08:59:06 -0000	1.35
-+++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx	22 Dec 2008 15:52:53 -0000
-@@ -290,6 +290,7 @@
-     void updateScreenNumber();
-     
-     void moveToScreen( int nScreen );
-+    guint32 safe_gdk_x11_get_server_time(GdkWindow *window);
- 
-     virtual ~GtkSalFrame();
- 


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