summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--pango/pangocairo-fcfont.c2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ff13dfa..089715b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-16 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangocairo-fcfont.c (pango_cairo_fc_font_unlock_face): Remove
+ excess return (#307741, Damien Carbery)
+
2005-06-14 Owen Taylor <otaylor@redhat.com>
* modules/indic/indic-ot-class-tables.c (guruCharClasses): Mark
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 7ff13dfa..089715b3 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2005-06-16 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangocairo-fcfont.c (pango_cairo_fc_font_unlock_face): Remove
+ excess return (#307741, Damien Carbery)
+
2005-06-14 Owen Taylor <otaylor@redhat.com>
* modules/indic/indic-ot-class-tables.c (guruCharClasses): Mark
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index e16b7bb4..5b06be81 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -251,7 +251,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);
- return cairo_ft_scaled_font_unlock_face (scaled_font);
+ cairo_ft_scaled_font_unlock_face (scaled_font);
}
static PangoGlyph