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

GtkEntryAccessible: Slight simplification of attribute handling

Browse Source 
Make this use the same convenience function as is used elsewhwere.
This commit is contained in:
Matthias Clasen
2011-06-26 20:42:54 -04:00
parent 786ade734c
commit 42cc6ad6c6
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/a11y/gtkentryaccessible.c
View File

@ -367,15 +367,15 @@ gtk_entry_accessible_set_caret_offset (AtkText *text,
} }
static AtkAttributeSet * static AtkAttributeSet *
add_attribute (AtkAttributeSet *attributes, add_text_attribute (AtkAttributeSet *attributes,
AtkTextAttribute attr, AtkTextAttribute attr,
const gchar *value) gint i)
{ {
AtkAttribute *at; AtkAttribute *at;
at = g_new (AtkAttribute, 1); at = g_new (AtkAttribute, 1);
at->name = g_strdup (atk_text_attribute_get_name (attr)); at->name = g_strdup (atk_text_attribute_get_name (attr));
at->value = g_strdup (value); at->value = g_strdup (atk_text_attribute_get_value (attr, i));
return g_slist_prepend (attributes, at); return g_slist_prepend (attributes, at);
} }
@ -394,9 +394,8 @@ gtk_entry_accessible_get_run_attributes (AtkText *text,
return NULL; return NULL;
attributes = NULL; attributes = NULL;
attributes = add_attribute (attributes, ATK_TEXT_ATTR_DIRECTION, attributes = add_text_attribute (attributes, ATK_TEXT_ATTR_DIRECTION,
atk_text_attribute_get_value (ATK_TEXT_ATTR_DIRECTION, gtk_widget_get_direction (widget));
gtk_widget_get_direction (widget)));
attributes = _gtk_pango_get_run_attributes (attributes, attributes = _gtk_pango_get_run_attributes (attributes,
gtk_entry_get_layout (GTK_ENTRY (widget)), gtk_entry_get_layout (GTK_ENTRY (widget)),
offset, offset,
@ -417,9 +416,8 @@ gtk_entry_accessible_get_default_attributes (AtkText *text)
return NULL; return NULL;
attributes = NULL; attributes = NULL;
attributes = add_attribute (attributes, ATK_TEXT_ATTR_DIRECTION, attributes = add_text_attribute (attributes, ATK_TEXT_ATTR_DIRECTION,
atk_text_attribute_get_value (ATK_TEXT_ATTR_DIRECTION, gtk_widget_get_direction (widget));
gtk_widget_get_direction (widget)));
attributes = _gtk_pango_get_default_attributes (attributes, attributes = _gtk_pango_get_default_attributes (attributes,
gtk_entry_get_layout (GTK_ENTRY (widget))); gtk_entry_get_layout (GTK_ENTRY (widget)));
attributes = _gtk_style_context_get_attributes (attributes, attributes = _gtk_style_context_get_attributes (attributes,