summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-09-07 23:05:20 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-09-07 23:05:20 +0000
commit4e9d86a3e715f6c0806a2019def34153b02dea1c (patch)
treead45e97439cce894c0827f5ef76d56d6210224db
parent5c3fab4f67ff34382123ef7f11b0935b09188cc1 (diff)
downloadpango-4e9d86a3e715f6c0806a2019def34153b02dea1c.tar.gz
Patch from Chris Wilson
2007-09-07 Behdad Esfahbod <behdad@gnome.org> Patch from Chris Wilson * pango/pangoft2.c (load_fallback_face): Use g_error() instead of g_warning()+exit(). svn path=/trunk/; revision=2421
-rw-r--r--ChangeLog7
-rw-r--r--pango/pangoft2.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c054842..26a5b9e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-07 Behdad Esfahbod <behdad@gnome.org>
+
+ Patch from Chris Wilson
+
+ * pango/pangoft2.c (load_fallback_face): Use g_error() instead
+ of g_warning()+exit().
+
2007-09-02 Mathias Hasselmann <mathias.hasselmann@gmx.de>
Bug 472891 – Bad consistency check in pango_get_log_attrs
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index f23f1ed9..e8800344 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -118,8 +118,7 @@ load_fallback_face (PangoFT2Font *ft2font,
{
bail1:
name = pango_font_description_to_string (fcfont->description);
- g_warning ("Unable to open font file %s for font %s, exiting\n", filename2, name);
- exit (1);
+ g_error ("Unable to open font file %s for font %s, exiting\n", filename2, name);
}
else
{