callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

label: Allow using more underline modes

Browse Source
This commit is contained in:
Benjamin Otte
2011-04-25 01:48:59 +02:00
parent 1e1cca8912
commit 69300df1fc
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtklabel.c
View File

@ -1346,8 +1346,16 @@ attribute_from_text (GtkBuilder *builder,
attribute = pango_attr_stretch_new (g_value_get_enum (&val)); attribute = pango_attr_stretch_new (g_value_get_enum (&val));
break; break;
case PANGO_ATTR_UNDERLINE: case PANGO_ATTR_UNDERLINE:
if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_UNDERLINE, value, &val, NULL))
attribute = pango_attr_underline_new (g_value_get_enum (&val));
else
{
/* XXX: allow boolean for backwards compat, so ignore error */
/* Deprecate this somehow */
g_value_unset (&val);
if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error)) if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))
attribute = pango_attr_underline_new (g_value_get_boolean (&val)); attribute = pango_attr_underline_new (g_value_get_boolean (&val));
}
break; break;
case PANGO_ATTR_STRIKETHROUGH: case PANGO_ATTR_STRIKETHROUGH:
if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error)) if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))