summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--pango/pangocairo-fcfont.c2
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f4f35439..e20cfb54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2006-02-11 Behdad Esfahbod <behdad@gnome.org>
+2006-02-22 Behdad Esfahbod <behdad@gnome.org>
+
+ Bug 332167 – Void function returns value - breaks Solaris build
+ Reported by Damien Carbery
+
+ * pango/pangocairo-fcfont (pango_cairo_fc_font_unlock_face): Simply
+ return.
+
+2006-02-21 Behdad Esfahbod <behdad@gnome.org>
* === Released 1.11.6 ===
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index 086368ff..31a91afb 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -308,7 +308,7 @@ pango_cairo_fc_font_unlock_face (PangoFcFont *font)
PangoCairoFont *cfont = (PangoCairoFont *)font;
cairo_scaled_font_t *scaled_font = pango_cairo_fc_font_get_scaled_font (cfont);
if (G_UNLIKELY (!scaled_font))
- return NULL;
+ return;
cairo_ft_scaled_font_unlock_face (scaled_font);
}