r16184 - in /desktop/unstable/gtk+2.0/debian: changelog patches/092_openoffice-menus.patch patches/series

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sat Jun  7 08:28:42 2008
New Revision: 16184

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16184
Log:
* debian/patches/092_openoffice-menus.patch:
  + Patch from upstream SVN to fix regression in menu placement
    in openoffice.org (Closes: #484580).

Added:
    desktop/unstable/gtk+2.0/debian/patches/092_openoffice-menus.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=16184&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sat Jun  7 08:28:42 2008
@@ -1,3 +1,11 @@
+gtk+2.0 (2.12.10-2) unstable; urgency=low
+
+  * debian/patches/092_openoffice-menus.patch:
+    + Patch from upstream SVN to fix regression in menu placement
+      in openoffice.org (Closes: #484580).
+
+ -- Sebastian Dröge <slomo at debian.org>  Sat, 07 Jun 2008 10:27:50 +0200
+
 gtk+2.0 (2.12.10-1) unstable; urgency=low
 
   * New upstream bugfix release:

Added: desktop/unstable/gtk+2.0/debian/patches/092_openoffice-menus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/092_openoffice-menus.patch?rev=16184&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/092_openoffice-menus.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/092_openoffice-menus.patch Sat Jun  7 08:28:42 2008
@@ -1,0 +1,32 @@
+Index: gdk/x11/gdkwindow-x11.c
+===================================================================
+--- gtk/gdk/x11/gdkwindow-x11.c	(revision 20280)
++++ gtk/gdk/x11/gdkwindow-x11.c	(working copy)
+@@ -3412,6 +3412,7 @@
+   Window xwindow;
+   Window xparent;
+   Window root;
++  Window child;
+   Window *children;
+   guchar *data;
+   Window *vroots;
+@@ -3470,13 +3471,15 @@
+       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;
+

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=16184&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Sat Jun  7 08:28:42 2008
@@ -20,3 +20,4 @@
 070_mandatory-relibtoolize.patch
 091_workaround_no_gtk_init_incorrect_display.patch
 095_gtk-im-module-setting.patch
+092_openoffice-menus.patch