r13128 - in /desktop/unstable/gtk+2.0/debian: changelog patches/071_fix_gdk_window_null_crasher.patch patches/series

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Oct 14 18:50:25 2007
New Revision: 13128

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13128
Log:
* Enable 091_workaround_no_gtk_init_incorrect_display to allow the non-free
  Flash plugin to work for users of non-Gtk browsers; please do bug Adobe
  about this; closes: #443661, #440165.
* New patch, 071_fix_gdk_window_null_crasher, fixes potential crashes in
  IceWeasel's print preview dialog; GNOME #482531; LP #144326; found in the
  Ubuntu package.

Added:
    desktop/unstable/gtk+2.0/debian/patches/071_fix_gdk_window_null_crasher.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=13128&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sun Oct 14 18:50:25 2007
@@ -1,4 +1,4 @@
-gtk+2.0 (2.12.0-3) UNRELEASED; urgency=low
+gtk+2.0 (2.12.0-3) unstable; urgency=low
 
   [ Josselin Mouette ]
   * 031_gtksearchenginetracker_fixes.patch: new patch.
@@ -36,8 +36,14 @@
   * New patch, 065_gtk-filechooser-locale-time, fixes conversion of localized
     week days in non-UTF-8 locales in the file chooser; GNOME #482504;
     closes: #444927.
-
- -- Loic Minier <lool at dooz.org>  Sun, 14 Oct 2007 20:38:18 +0200
+  * Enable 091_workaround_no_gtk_init_incorrect_display to allow the non-free
+    Flash plugin to work for users of non-Gtk browsers; please do bug Adobe
+    about this; closes: #443661, #440165.
+  * New patch, 071_fix_gdk_window_null_crasher, fixes potential crashes in
+    IceWeasel's print preview dialog; GNOME #482531; LP #144326; found in the
+    Ubuntu package.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 14 Oct 2007 20:46:29 +0200
 
 gtk+2.0 (2.12.0-2) unstable; urgency=low
 

Added: desktop/unstable/gtk+2.0/debian/patches/071_fix_gdk_window_null_crasher.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/071_fix_gdk_window_null_crasher.patch?rev=13128&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/071_fix_gdk_window_null_crasher.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/071_fix_gdk_window_null_crasher.patch Sun Oct 14 18:50:25 2007
@@ -1,0 +1,68 @@
+--- gdk/gdkwindow.c.orig	2007-10-02 11:22:11.000000000 +0200
++++ gtk+2.0-2.12.0/gdk/gdkwindow.c	2007-10-02 11:22:20.000000000 +0200
+@@ -609,18 +609,21 @@ gdk_window_get_parent (GdkWindow *window
+ GdkWindow*
+ gdk_window_get_toplevel (GdkWindow *window)
+ {
+   GdkWindowObject *obj;
+   
+   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);
+ }
+ 
+ /**
+  * gdk_window_get_children:
+  * @window: a #GdkWindow
+  * 
+@@ -2290,19 +2293,21 @@ gdk_window_update_idle (gpointer data)
+   return FALSE;
+ }
+ 
+ static gboolean
+ gdk_window_is_toplevel_frozen (GdkWindow *window)
+ {
+   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
+ gdk_window_schedule_update (GdkWindow *window)
+ {
+   if (window &&
+       (GDK_WINDOW_OBJECT (window)->update_freeze_count ||
+        gdk_window_is_toplevel_frozen (window)))
+@@ -2428,16 +2433,19 @@ gdk_window_process_all_updates (void)
+   
+   update_windows = NULL;
+   update_idle = 0;
+ 
+   g_slist_foreach (old_update_windows, (GFunc)g_object_ref, NULL);
+   
+   while (tmp_list)
+     {
++      if(!tmp_list->data)
++        continue;
++
+       GdkWindowObject *private = (GdkWindowObject *)tmp_list->data;
+       
+       if (private->update_freeze_count ||
+ 	  gdk_window_is_toplevel_frozen (tmp_list->data))
+ 	update_windows = g_slist_prepend (update_windows, private);
+       else
+ 	gdk_window_process_updates_internal (tmp_list->data);
+       

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=13128&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Sun Oct 14 18:50:25 2007
@@ -17,5 +17,7 @@
 060_opening-display-by-env-error-message.patch
 065_gtk-filechooser-locale-time.patch -p0
 070_mandatory-relibtoolize.patch
+071_fix_gdk_window_null_crasher
 080_from_bugzilla_workaround_eclipse_crash.patch
 081_icon-cache-validate.patch
+091_workaround_no_gtk_init_incorrect_display