Fix for bug #346464, allow underlines in gtk with style "PANGO_UNDERLINE_ERROR".

diff --git a/ChangeLog b/ChangeLog
index c39e1da..25cf54e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-14  Bill Haneman <bill.haneman@sun.com>
+
+       * atk/atktext.c:
+       (atk_text_attribute_get_value): Allow value of
+       PANGO_UNDERLINE_ERROR, since this is not an error condition, but
+       denotes the underline style used to indicate spelling errors.
+       Bug #346464.
+       
 2006-09-08  Bill Haneman <bill.haneman@sun.com>
 
        * atk/atkhyperlinkimpl.c:

diff --git a/atk/atktext.c b/atk/atktext.c
index 19712dd..a2c30b7 100755 (executable)
--- a/atk/atktext.c
+++ b/atk/atktext.c
@@ -1129,7 +1129,7 @@ atk_text_attribute_get_value (AtkTextAttribute attr,
       g_assert (index >= 0 && index < 2);
       return bool[index];
     case ATK_TEXT_ATTR_UNDERLINE:
-      g_assert (index >= 0 && index < 4);
+      g_assert (index >= 0 && index < 5);
       return underline[index];
     case ATK_TEXT_ATTR_WRAP_MODE:
       g_assert (index >= 0 && index < 3);