* drop yet another patch

debian/changelog

@@ -2,9 +2,9 @@ gtk+2.0 (2.12.2-1) UNRELEASED; urgency=low
 
   * New upstream stable release; no API change; bug fixes and translation
     updated.
-    - Drop patch 034_gtkcupsutils_type_fix fixed upstream.
+    - Drop patches 034_gtkcupsutils_type_fix, 071_fix_gdk_window_null_crasher
+      fixed upstream.
     - Update relibtoolizing patch, 070_mandatory-relibtoolize.
-    - Update patch 071_fix_gdk_window_null_crasher to apply cleanly.
 
  -- Sebastian Dröge <slomo@debian.org>  Tue, 27 Nov 2007 05:15:01 +0100
 

debian/patches/071_fix_gdk_window_null_crasher.patch

@@ -1,40 +0,0 @@
---- gdk/gdkwindow.c.old	2007-11-27 05:31:06.000000000 +0100
-+++ gtk+2.0-2.12.2/gdk/gdkwindow.c	2007-11-27 05:33:15.000000000 +0100
-@@ -614,9 +614,12 @@
-   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
- 
-   obj = (GdkWindowObject *)window;
--  while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD)
-+  while (obj && GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD) {
-     obj = (GdkWindowObject *)obj->parent;
--  
-+  }
-+
-+  g_return_val_if_fail (obj != NULL, NULL);
-+
-   return GDK_WINDOW (obj);
- }
- 
-@@ -2295,9 +2298,11 @@
- {
-   GdkWindowObject *toplevel;
- 
-+  g_return_val_if_fail (window != NULL, FALSE);
-+
-   toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window);
- 
--  return toplevel->update_and_descendants_freeze_count > 0;
-+  return toplevel ? toplevel->update_and_descendants_freeze_count > 0 : FALSE;
- }
- 
- static void
-@@ -2433,6 +2438,9 @@
-   
-   while (tmp_list)
-     {
-+      if(!tmp_list->data)
-+        continue;
-+
-       GdkWindowObject *private = (GdkWindowObject *)tmp_list->data;
-       
-       if (!GDK_WINDOW_DESTROYED (tmp_list->data))

debian/patches/series

@@ -19,5 +19,4 @@
 042_treeview_single-focus.patch
 060_ignore-random-icons.patch
 070_mandatory-relibtoolize.patch
-071_fix_gdk_window_null_crasher.patch
 091_workaround_no_gtk_init_incorrect_display.patch