summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2008-12-09 21:42:06 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2008-12-09 21:42:06 +0000
commitf45503c03c9fff14839a4a1c263b93413f5601c6 (patch)
tree1a1493175de8d991693cc38385f7a08d167dfe08
parentc66cf7070344636807ef1766beb41e3bbb8c26b1 (diff)
downloadpango-f45503c03c9fff14839a4a1c263b93413f5601c6.tar.gz
Don't call exit(). Let us crash.
2008-12-09 Behdad Esfahbod <behdad@gnome.org> * pango/pangoxft-font.c (pango_xft_font_init), (load_fallback_font): Don't call exit(). Let us crash. svn path=/trunk/; revision=2756
-rw-r--r--ChangeLog5
-rw-r--r--pango/pangoxft-font.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a10833d1..284d3a67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-12-09 Behdad Esfahbod <behdad@gnome.org>
+ * pango/pangoxft-font.c (pango_xft_font_init),
+ (load_fallback_font): Don't call exit(). Let us crash.
+
+2008-12-09 Behdad Esfahbod <behdad@gnome.org>
+
Bug 563803 – pango_renderer_finalize fails to call parent finalize
* pango/pango-renderer.c (pango_renderer_class_init),
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 6101ae9e..ce633f70 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -76,7 +76,7 @@ pango_xft_font_class_init (PangoXftFontClass *class)
}
static void
-pango_xft_font_init (PangoXftFont *xftfont)
+pango_xft_font_init (PangoXftFont *xftfont G_GNUC_UNUSED)
{
}
@@ -371,12 +371,6 @@ load_fallback_font (PangoXftFont *xfont)
size_is_absolute ? FC_PIXEL_SIZE : FC_SIZE, FcTypeDouble, size,
NULL);
- if (!xft_font)
- {
- g_warning ("Cannot open fallback font, nothing to do");
- exit (1);
- }
-
xfont->xft_font = xft_font;
}