rpms/gtk2/F-9 geometry.patch,NONE,1.1 gtk2.spec,1.290,1.291

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24974

Modified Files:
	gtk2.spec 
Added Files:
	geometry.patch 
Log Message:
fix coordinate system confusion


geometry.patch:

--- NEW FILE geometry.patch ---
diff -up gtk+-2.12.10/gdk/x11/gdkwindow-x11.c.geometry gtk+-2.12.10/gdk/x11/gdkwindow-x11.c
--- gtk+-2.12.10/gdk/x11/gdkwindow-x11.c.geometry	2008-06-08 01:13:00.000000000 -0400
+++ gtk+-2.12.10/gdk/x11/gdkwindow-x11.c	2008-06-08 01:13:09.000000000 -0400
@@ -3412,6 +3412,7 @@ gdk_window_get_frame_extents (GdkWindow 
   Window xwindow;
   Window xparent;
   Window root;
+  Window child;
   Window *children;
   guchar *data;
   Window *vroots;
@@ -3470,13 +3471,15 @@ gdk_window_get_frame_extents (GdkWindow 
       if ((type_return == XA_CARDINAL) && (format_return == 32) &&
 	  (nitems_return == 4) && (data))
         {
-	  guint32 *ldata = (guint32 *) data;
+	  gulong *ldata = (gulong *) data;
 	  got_frame_extents = TRUE;
 
 	  /* try to get the real client window geometry */
 	  if (XGetGeometry (GDK_DISPLAY_XDISPLAY (display), xwindow,
-			    &root, &wx, &wy, &ww, &wh, &wb, &wd))
-	    {
+			    &root, &wx, &wy, &ww, &wh, &wb, &wd) &&
+              XTranslateCoordinates (GDK_DISPLAY_XDISPLAY (display),
+	  			     xwindow, root, 0, 0, &wx, &wy, &child))
+            {
 	      rect->x = wx;
 	      rect->y = wy;
 	      rect->width = ww;


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-9/gtk2.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- gtk2.spec	3 Jun 2008 23:21:46 -0000	1.290
+++ gtk2.spec	8 Jun 2008 05:16:11 -0000	1.291
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -46,6 +46,9 @@
 # Backported patch from recent upstream
 Patch10: printer-state.patch
 
+# fixed in upstream svn
+Patch11: geometry.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -126,6 +129,7 @@
 %patch3 -p1 -b .system-log-crash
 %patch4 -p1 -b .im-setting
 %patch10 -p0 -b .printer-state
+%patch11 -p1 -b .geometry
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -318,6 +322,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Sun Jun  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.12.10-2
+- Fix a coordinate system problem
+
 * Thu May 22 2008 - Marek Kasik <mkasik at redhat.com> - 2.12.9-6
 - Add patch to display more printer status information in the
   print dialog (backported from upstream 2.13.1).