[gnumeric] Style: avoid critical on seeing PANGO_UNDERLINE_ERROR.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Style: avoid critical on seeing PANGO_UNDERLINE_ERROR.
- Date: Thu, 11 Sep 2014 12:53:23 +0000 (UTC)
commit d1d00d1d75566e15c890c51c41ed5d5917824001
Author: Morten Welinder <terra gnome org>
Date: Thu Sep 11 08:55:26 2014 -0400
Style: avoid critical on seeing PANGO_UNDERLINE_ERROR.
ChangeLog | 5 +++++
src/style.c | 4 +++-
2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a0aed10..c37023c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-11 Morten Welinder <terra gnome org>
+
+ * src/style.c (gnm_translate_underline_from_pango): Survive
+ PANGO_UNDERLINE_ERROR.
+
2014-06-09 Morten Welinder <terra gnome org>
* configure.ac: Post-release bump.
diff --git a/src/style.c b/src/style.c
index 15fdb0d..33c2ca8 100644
--- a/src/style.c
+++ b/src/style.c
@@ -644,7 +644,7 @@ GnmUnderline
gnm_translate_underline_from_pango (PangoUnderline pul)
{
g_return_val_if_fail (pul >= PANGO_UNDERLINE_NONE, UNDERLINE_NONE);
- g_return_val_if_fail (pul <= PANGO_UNDERLINE_LOW, UNDERLINE_NONE);
+ g_return_val_if_fail (pul <= PANGO_UNDERLINE_ERROR, UNDERLINE_NONE);
switch (pul) {
case PANGO_UNDERLINE_SINGLE:
@@ -653,6 +653,8 @@ gnm_translate_underline_from_pango (PangoUnderline pul)
return UNDERLINE_DOUBLE;
case PANGO_UNDERLINE_LOW:
return UNDERLINE_SINGLE_LOW;
+ case PANGO_UNDERLINE_ERROR:
+ /* What? */
case PANGO_UNDERLINE_NONE:
default:
return UNDERLINE_NONE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]