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

Caolan McNamara caolanm at fedoraproject.org
Thu Jul 1 13:14:16 UTC 2010


Author: caolanm

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

Modified Files:
	workspace.gtk3.patch 
Log Message:
and some more spew

workspace.gtk3.patch:
 configure.in                          |    6 
 source/appl/makefile.mk               |    2 
 source/appl/shutdowniconunx.cxx       |   22 
 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/unx/npnapi.cxx          |    5 
 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 
 27 files changed, 743 insertions(+), 453 deletions(-)

Index: workspace.gtk3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.gtk3.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- workspace.gtk3.patch	1 Jul 2010 11:54:40 -0000	1.4
+++ workspace.gtk3.patch	1 Jul 2010 13:14:16 -0000	1.5
@@ -734,7 +734,43 @@
          CFLAGS+=-DENABLE_QUICKSTART_APPLET
 --- sfx2.orig/source/appl/shutdowniconunx.cxx	2010-05-29 21:22:29.000000000 +0100
 +++ sfx2/source/appl/shutdowniconunx.cxx	2010-05-30 12:59:35.000000000 +0100
-@@ -372,8 +372,12 @@
+@@ -302,18 +302,34 @@
+ 			 gpointer )
+ {
+ 	GtkRequisition req;
+-	GtkWidget *ebox = GTK_BIN( pTrayIcon )->child;
++	GtkWidget *ebox = gtk_bin_get_child(GTK_BIN( pTrayIcon ));
+ 
+ 	gtk_widget_size_request( GTK_WIDGET( menu ), &req );
++#if GTK_CHECK_VERSION(2,90,0)
++	gdk_window_get_origin( gtk_widget_get_window(ebox), x, y );
++
++	GtkAllocation allocation;
++	gtk_widget_get_allocation(ebox, &allocation);
++
++	(*x) += allocation.x;
++	(*y) += allocation.y;
++#else
+ 	gdk_window_get_origin( ebox->window, x, y );
+ 
+ 	(*x) += ebox->allocation.x;
+ 	(*y) += ebox->allocation.y;
++#endif
+ 
+ 	if (*y >= gdk_screen_get_height (gtk_widget_get_screen (ebox)) / 2)
+ 		(*y) -= req.height;
+ 	else
++	{
++#if GTK_CHECK_VERSION(2,90,0)
++		(*y) += allocation.height;
++#else
+ 		(*y) += ebox->allocation.height;
++#endif
++	}
+ 
+ 	*push_in = TRUE;
+ }
+@@ -372,8 +388,12 @@
  	pTrayIcon = egg_tray_icon_new( aLabel );
  
  	GtkWidget *pParent = gtk_event_box_new();
@@ -2546,3 +2582,18 @@
      }
  }
  
+--- extensions.orig/source/plugin/unx/npnapi.cxx	2010-07-01 13:42:35.000000000 +0100
++++ extensions/source/plugin/unx/npnapi.cxx	2010-07-01 13:44:46.000000000 +0100
+@@ -701,8 +701,11 @@
+                         pInst->window.window = (void *)gtk_socket_get_id( GTK_SOCKET(pInst->pGtkWidget ) );
+ 
+                         XSync( pAppDisplay, False );
+-
++#if GTK_CHECK_VERSION(2,90,0)
++                        XMapWindow( pAppDisplay, GDK_WINDOW_XWINDOW(gtk_widget_get_window(pInst->pGtkWindow)) );
++#else
+                         XMapWindow( pAppDisplay, GDK_WINDOW_XWINDOW(pInst->pGtkWindow->window) );
++#endif
+ 
+                         XSync( pAppDisplay, False );
+                     }



More information about the scm-commits mailing list