- Fix crashes when using GTK+ themes containing a gtkrc which specify

GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing
This commit is contained in:
Christopher Aillon 2007-09-11 18:55:30 +00:00
parent 5c1d44cbf6
commit e7f0eeea85
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,15 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=389801
--- mozilla/gfx/src/gtk/gtk2drawing.c.fixgtk212 2005-09-13 05:30:53.000000000 +0200
+++ mozilla/gfx/src/gtk/gtk2drawing.c 2007-09-06 09:42:34.000000000 +0200
@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
else
*indicator_spacing = default_indicator_spacing;
- g_free(tmp_indicator_size);
- g_free(tmp_indicator_spacing);
+ gtk_requisition_free(tmp_indicator_size);
+ gtk_border_free(tmp_indicator_spacing);
return MOZ_GTK_SUCCESS;
}

View File

@ -12,7 +12,7 @@
Summary: Mozilla Firefox Web browser. Summary: Mozilla Firefox Web browser.
Name: firefox Name: firefox
Version: 2.0.0.6 Version: 2.0.0.6
Release: 7%{?dist} Release: 8%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -71,6 +71,7 @@ Patch89: firefox-1.5-xft-rangewidth.patch
Patch102: firefox-1.5-theme-change.patch Patch102: firefox-1.5-theme-change.patch
Patch104: firefox-1.5-ppc64.patch Patch104: firefox-1.5-ppc64.patch
Patch105: firefox-2.0-dnd.patch Patch105: firefox-2.0-dnd.patch
Patch106: firefox-2.0-indicator-crash.patch
%if %{official_branding} %if %{official_branding}
# Required by Mozilla Corporation # Required by Mozilla Corporation
@ -172,6 +173,7 @@ removed in favor of xulrunner-devel.
%patch102 -p0 -b .theme-change %patch102 -p0 -b .theme-change
%patch104 -p1 -b .ppc64 %patch104 -p1 -b .ppc64
%patch105 -p0 -b .dnd %patch105 -p0 -b .dnd
%patch106 -p1 -b .indicator-crash
# For branding specific patches. # For branding specific patches.
@ -438,6 +440,10 @@ fi
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Sep 11 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.6-8
- Fix crashes when using GTK+ themes containing a gtkrc which specify
GtkOptionMenu::indicator_size and GtkOptionMenu::indicator_spacing
* Mon Sep 10 2007 Martin Stransky <stransky@redhat.com> 2.0.0.6-7 * Mon Sep 10 2007 Martin Stransky <stransky@redhat.com> 2.0.0.6-7
- added fix for #246248 - firefox crashes when searching for word "do" - added fix for #246248 - firefox crashes when searching for word "do"