r26085 - in /desktop/experimental/gtk+2.0/debian: changelog patches/006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Dec 23 18:33:22 2010
New Revision: 26085

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26085
Log:
* 006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch:
  + Patch from upstream git, make gdk_window_foreign_new_for_display
    not a nop.

Added:
    desktop/experimental/gtk+2.0/debian/patches/006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch
Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/patches/series

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=26085&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Thu Dec 23 18:33:22 2010
@@ -1,3 +1,11 @@
+gtk+2.0 (2.23.3-2) UNRELEASED; urgency=low
+
+  * 006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch:
+    + Patch from upstream git, make gdk_window_foreign_new_for_display
+      not a nop.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 23 Dec 2010 18:31:24 +0000
+
 gtk+2.0 (2.23.3-1) experimental; urgency=low
 
   * New upstream release.

Added: desktop/experimental/gtk+2.0/debian/patches/006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch?rev=26085&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch [utf-8] Thu Dec 23 18:33:22 2010
@@ -1,0 +1,26 @@
+From 120915d6deff05c0154c9d44c3903a8a6e1b3036 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Thu, 23 Dec 2010 11:58:26 -0500
+Subject: [PATCH] Reinstate the implementation of gdk_window_foreign_new_for_display
+
+This was accidentally dropped when introducing
+gdk_x11_window_foreign_new_for_display().
+---
+ gdk/x11/gdkwindow-x11.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
+index d84e0e0..c2c32f0 100644
+--- a/gdk/x11/gdkwindow-x11.c
++++ b/gdk/x11/gdkwindow-x11.c
+@@ -880,6 +880,7 @@ GdkWindow *
+ gdk_window_foreign_new_for_display (GdkDisplay     *display,
+ 				    GdkNativeWindow anid)
+ {
++  return gdk_x11_window_foreign_new_for_display (display, anid);
+ }
+ 
+ /**
+-- 
+1.7.2.3
+

Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=26085&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series [utf-8] Thu Dec 23 18:33:22 2010
@@ -3,6 +3,7 @@
 003_gdk.pc_privates.patch
 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
 005_support_disabling_x11_extensions.patch
+006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch
 009_gtk-export-filechooser.patch
 011_immodule-cache-dir.patch
 015_default-fallback-icon-theme.patch