summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2007-10-03 06:39:37 +0000
committerAlexander Larsson <alexl@src.gnome.org>2007-10-03 06:39:37 +0000
commitaf61580b25a723561e470180fe9152b55090e07e (patch)
treeebb5116809a091ffd7dbb8b1a0b01639800ce467
parent66199ebf4462d41c35321b72d158b332a86880fd (diff)
downloadnautilus-af61580b25a723561e470180fe9152b55090e07e.tar.gz
Fix crash with small fonts (#454884)
2007-10-03 Alexander Larsson <alexl@redhat.com> * src/nautilus-sidebar-title.c: (update_title_font): Fix crash with small fonts (#454884) svn path=/branches/gnome-2-20/; revision=13256
-rw-r--r--ChangeLog6
-rw-r--r--src/nautilus-sidebar-title.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b5d0b057..c3571a013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-03 Alexander Larsson <alexl@redhat.com>
+
+ * src/nautilus-sidebar-title.c:
+ (update_title_font):
+ Fix crash with small fonts (#454884)
+
2007-10-02 Frederic Crozat <fcrozat@mandriva.com>
Backport from gio-branch, fixes #480608, from
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index db2ab90a2..924f6e176 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -364,7 +364,7 @@ update_title_font (NautilusSidebarTitle *sidebar_title)
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;
}