rpms/gtk2/devel firefox-print-preview.patch, NONE, 1.1 gtk2.spec, 1.262, 1.263

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv398

Modified Files:
	gtk2.spec 
Added Files:
	firefox-print-preview.patch 
Log Message:
fix a firefox print preview crash


firefox-print-preview.patch:

--- NEW FILE firefox-print-preview.patch ---
Index: gtk+/gdk/gdkwindow.c
===================================================================
--- gtk+/gdk/gdkwindow.c	(revision 18802)
+++ gtk+/gdk/gdkwindow.c	(working copy)
@@ -615,7 +615,11 @@ gdk_window_get_toplevel (GdkWindow *wind
 
   obj = (GdkWindowObject *)window;
   while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD)
-    obj = (GdkWindowObject *)obj->parent;
+    {
+      obj = (GdkWindowObject *)obj->parent;
+      if (!obj)
+	return NULL;
+    }
   
   return GDK_WINDOW (obj);
 }
@@ -2297,6 +2301,9 @@ gdk_window_is_toplevel_frozen (GdkWindow
 
   toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window);
 
+  if (!toplevel)
+    return FALSE;
+
   return toplevel->update_and_descendants_freeze_count > 0;
 }
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- gtk2.spec	17 Oct 2007 05:28:23 -0000	1.262
+++ gtk2.spec	18 Oct 2007 03:32:59 -0000	1.263
@@ -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
@@ -31,6 +31,8 @@
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=482531
+Patch3: firefox-print-preview.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -108,6 +110,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
+%patch3 -p1 -b .firefox-print-preview
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -290,6 +293,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Oct 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.1-2
+- Fix a crash in the firefox print preview (#336771)
+
 * Wed Oct 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.1-1
 - Update to 2.12.1 (bug fixes and translation updates)
 - Drop obsolete patches