rpms/gtk2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a firefox print preview crash

Browse Source
This commit is contained in:
Matthias Clasen 2007-10-18 03:32:59 +00:00
parent 4a0d104603
commit 1e8131a12b
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
firefox-print-preview.patch Normal file
View File

@ -0,0 +1,27 @@
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;
}

8
gtk2.spec
View File

@ -16,7 +16,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2 Name: gtk2
Version: %{base_version} Version: %{base_version}
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@ -31,6 +31,8 @@ Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
# see http://bugzilla.gnome.org/show_bug.cgi?id=463773 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
Patch2: workaround.patch Patch2: workaround.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=482531
Patch3: firefox-print-preview.patch
BuildRequires: atk-devel >= %{atk_version} BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
@ -108,6 +110,7 @@ docs for the GTK+ widget toolkit.
%patch0 -p1 -b .lib64 %patch0 -p1 -b .lib64
%patch1 -p1 -b .set-invisible-char-to-bullet %patch1 -p1 -b .set-invisible-char-to-bullet
%patch2 -p1 -b .workaround %patch2 -p1 -b .workaround
%patch3 -p1 -b .firefox-print-preview
for i in config.guess config.sub ; do for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@ -290,6 +293,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-2.0 %{_datadir}/gtk-2.0
%changelog %changelog
* Wed Oct 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.1-2
- Fix a crash in the firefox print preview (#336771)
* Wed Oct 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.1-1 * Wed Oct 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.1-1
- Update to 2.12.1 (bug fixes and translation updates) - Update to 2.12.1 (bug fixes and translation updates)
- Drop obsolete patches - Drop obsolete patches