fix a crash with small fonts

This commit is contained in:
Matthias Clasen 2007-10-03 01:59:45 +00:00
parent 3862993742
commit a05d7fc50c
2 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up nautilus-2.20.0/src/nautilus-sidebar-title.c.small-font nautilus-2.20.0/src/nautilus-sidebar-title.c
--- nautilus-2.20.0/src/nautilus-sidebar-title.c.small-font 2007-10-02 21:04:51.000000000 -0400
+++ nautilus-2.20.0/src/nautilus-sidebar-title.c 2007-10-02 21:16:36.000000000 -0400
@@ -364,7 +364,7 @@ update_title_font (NautilusSidebarTitle
title_font = pango_font_description_copy (style->font_desc);
max_style_font_size = pango_font_description_get_size (title_font) * 1.8 / PANGO_SCALE;
- if (max_style_font_size < MIN_TITLE_FONT_SIZE) {
+ if (max_style_font_size < MIN_TITLE_FONT_SIZE + 1) {
max_style_font_size = MIN_TITLE_FONT_SIZE + 1;
}

View File

@ -18,7 +18,7 @@
Name: nautilus
Summary: Nautilus is a file manager for GNOME
Version: 2.20.0
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
Group: User Interface/Desktops
Source: http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
@ -81,6 +81,9 @@ Patch6: nautilus-2.16.2-dynamic-search.patch
# Backports from svn:
Patch7: nautilus-2.20-async_thumbnail_fixes.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=454884
Patch8: nautilus-2.20.0-small-font-fix.patch
%description
Nautilus integrates access to files, applications, media,
Internet-based resources and the Web. Nautilus delivers a dynamic and
@ -116,6 +119,7 @@ for writing nautilus extensions.
%patch5 -p1 -b .selinux
%patch6 -p1 -b .dynamic-search
%patch7 -p0 -b .async_thumbnail_fixes
%patch8 -p1 -b .small-font-fix
%build
@ -223,6 +227,9 @@ fi
%{_libdir}/*.so
%changelog
* Tue Oct 2 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0-3
- Fix a crash with small fonts (#242350)
* Tue Oct 2 2007 Alexander Larsson <alexl@redhat.com> - 2.20.0-1
- Backport fixes for async thumbnail loading from svn