summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-01-16 18:09:35 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-01-16 18:09:35 +0000
commitb012a12e567a3d2b7c903b4c5ec1d03e4a365fd4 (patch)
tree564bc5fd05e3f9a1d8cc5b08f1e1f6a52bab1b05
parent9028047d34e7c856947556d9b0cef900aae731c2 (diff)
downloadpango-b012a12e567a3d2b7c903b4c5ec1d03e4a365fd4.tar.gz
Bug 397327 – pango-layout.c: 'pango_layout_is_ellipsized' must return a
2007-01-16 Behdad Esfahbod <behdad@gnome.org> Bug 397327 – pango-layout.c: 'pango_layout_is_ellipsized' must return a value * pango/pango-layout.c (pango_layout_is_ellipsized): Use g_return_val_if_fail() instead of g_return_if_fail(). svn path=/trunk/; revision=2159
-rw-r--r--ChangeLog8
-rw-r--r--pango/pango-layout.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a72543e7..a960c809 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
+ Bug 397327 – pango-layout.c: 'pango_layout_is_ellipsized' must return
+ a value
+
+ * pango/pango-layout.c (pango_layout_is_ellipsized): Use
+ g_return_val_if_fail() instead of g_return_if_fail().
+
+2007-01-16 Behdad Esfahbod <behdad@gnome.org>
+
* pango/ellipsize.c (get_cluster_width): Fix width calculation.
Was causing ellipsization to stop at a zero-width glyph that was
part of a bigger cluster.
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index e708d555..9ece852c 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -864,7 +864,7 @@ pango_layout_get_ellipsize (PangoLayout *layout)
gboolean
pango_layout_is_ellipsized (PangoLayout *layout)
{
- g_return_if_fail (layout != NULL);
+ g_return_val_if_fail (layout != NULL, FALSE);
pango_layout_check_lines (layout);