rpms/openoffice.org/devel workspace.gtk3.patch,1.3,1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10664

Modified Files:
	workspace.gtk3.patch 
Log Message:
sigh, more spew

workspace.gtk3.patch:
 configure.in                          |    6 
 source/appl/makefile.mk               |    2 
 source/appl/shutdowniconunx.cxx       |    4 
 source/eggtrayicon-impl.h             |    2 
 source/eggtrayicon.c                  |   57 ++
 source/makefile.mk                    |    2 
 source/nsplugin/source/makefile.mk    |    2 
 source/ooo/makefile.mk                |    4 
 source/plugin/util/makefile.pmk       |    2 
 source/unx/gnome/SalGtkFilePicker.cxx |    6 
 source/unx/gnome/SalGtkPicker.cxx     |    4 
 source/unx/gnome/makefile.mk          |    6 
 unx/gtk/a11y/makefile.mk              |    2 
 unx/gtk/app/gtkdata.cxx               |   32 +
 unx/gtk/app/makefile.mk               |    2 
 unx/gtk/gdi/makefile.mk               |    2 
 unx/gtk/gdi/salnativewidgets-gtk.cxx  |  840 +++++++++++++++++++---------------
 unx/gtk/window/gtkframe.cxx           |  115 ++--
 unx/gtk/window/gtkobject.cxx          |    9 
 unx/gtk/window/makefile.mk            |    2 
 unx/inc/plugins/gtk/gtkdata.hxx       |    2 
 unx/inc/plugins/gtk/gtkgdi.hxx        |   39 +
 unx/inc/saldisp.hxx                   |    4 
 unx/source/app/saldisp.cxx            |   21 
 unx/source/app/salsys.cxx             |    2 
 util/makefile.mk                      |    4 
 26 files changed, 722 insertions(+), 451 deletions(-)

Index: workspace.gtk3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.gtk3.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.gtk3.patch	1 Jul 2010 10:54:04 -0000	1.3
+++ workspace.gtk3.patch	1 Jul 2010 11:54:40 -0000	1.4
@@ -547,7 +547,19 @@
  
 --- fpicker.orig/source/unx/gnome/SalGtkFilePicker.cxx	2010-05-29 21:22:49.000000000 +0100
 +++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx	2010-05-29 21:26:05.000000000 +0100
-@@ -1586,7 +1586,7 @@
+@@ -602,7 +602,11 @@
+     g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
+ 
+     GList *pChildren = 
++#if GTK_CHECK_VERSION(2,90,0)
++        gtk_container_get_children( GTK_CONTAINER( gtk_dialog_get_action_area(pDialog) ) );
++#else
+         gtk_container_get_children( GTK_CONTAINER( pDialog->action_area ) );
++#endif
+ 
+     for( GList *p = pChildren; p; p = p->next )
+         gtk_widget_destroy( GTK_WIDGET( p->data ) );
+@@ -1600,7 +1604,7 @@
      
  		gtk_image_set_from_pixbuf( GTK_IMAGE( preview ), pixbuf );
  		if( pixbuf )
@@ -2520,3 +2532,17 @@
  }
  
  void GtkSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
+--- fpicker.orig/source/unx/gnome/SalGtkPicker.cxx	2010-05-26 17:30:44.000000000 +0100
++++ fpicker/source/unx/gnome/SalGtkPicker.cxx	2010-07-01 12:51:05.000000000 +0100
+@@ -155,7 +157,11 @@
+     if (pParent)
+     {
+         gtk_widget_realize(mpDialog);
++#if GTK_CHECK_VERSION(2,90,0)
++        gdk_window_set_transient_for(gtk_widget_get_window(mpDialog), pParent);
++#else
+         gdk_window_set_transient_for(mpDialog->window, pParent);
++#endif
+     }
+ }
+