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

Parse <accessibility> but don't do anything yet. Do not strip

Browse Source 
2007-07-08  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkwidget.c (gtk_widget_buildable_custom_tag_start): 
    Parse <accessibility> but don't do anything yet.
    * gtk/gtk-builder-convert (GtkBuilderConverter._parse): 
    Do not strip atk/accessibility tags
    * tests/buildertest.c (test_widget): 
    Test this


svn path=/trunk/; revision=18399
This commit is contained in:
Johan Dahlin
2007-07-08 03:22:18 +00:00
committed by Johan Dahlin
parent 2af3c53e47
commit 0aeff7f47b
5 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-07-08 Johan Dahlin <jdahlin@async.com.br>
* gtk/gtkwidget.c (gtk_widget_buildable_custom_tag_start):
Parse <accessibility> but don't do anything yet.
* gtk/gtk-builder-convert (GtkBuilderConverter._parse):
Do not strip atk/accessibility tags
* tests/buildertest.c (test_widget):
Test this
Sun Jul 8 01:33:45 2007 Tim Janik <timj@gtk.org> Sun Jul 8 01:33:45 2007 Tim Janik <timj@gtk.org>
* gdk/gdkwindow.c: docu fixup by Bjoern Lindqvist, #454703. * gdk/gdkwindow.c: docu fixup by Bjoern Lindqvist, #454703.

3
docs/reference/gtk/gtk-builder-convert.xml
View File

@ -31,6 +31,9 @@ its output the file specified as the second argument.
Toolbars are not handled. Toolbars are not handled.
</para> </para>
<para> <para>
Support for accessibility is not yet implemented.
</para>
<para>
The script requires a python interpreter to run. The script requires a python interpreter to run.
</para> </para>
</refsect1> </refsect1>

3
gtk/gtk-builder-convert
View File

@ -171,8 +171,7 @@ class GtkBuilderConverter(object):
self._dom.removeChild(node) self._dom.removeChild(node)
# Strip unsupported tags # Strip unsupported tags
for tag in ['requires', 'accessibility', 'atkproperty', for tag in ['requires']:
'atkrelation']:
for child in self._dom.getElementsByTagName(tag): for child in self._dom.getElementsByTagName(tag):
child.parentNode.removeChild(child) child.parentNode.removeChild(child)

21
gtk/gtkwidget.c
View File

@ -8547,6 +8547,12 @@ static const GMarkupParser accel_group_parser =
accel_group_start_element, accel_group_start_element,
}; };
static const GMarkupParser accessibility_parser =
{
NULL,
};
static gboolean static gboolean
gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable, gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
@ -8567,6 +8573,21 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable,
*data = parser_data; *data = parser_data;
return TRUE; return TRUE;
} }
else if (strcmp (tagname, "accessibility") == 0)
{
static gboolean warning_showed = FALSE;
if (!warning_showed)
{
g_warning ("<accessibility> is being ignored,\n"
"see http://bugzilla.gnome.org/show_bug.cgi?id=454653\n");
warning_showed = TRUE;
}
*parser = accessibility_parser;
*data = NULL;
return TRUE;
}
return FALSE; return FALSE;
} }

15
tests/buildertest.c
View File

@ -1466,6 +1466,15 @@ gboolean test_widget (void)
" </child>" " </child>"
" </object>" " </object>"
"</interface>"; "</interface>";
gchar *buffer3 =
"<interface>"
" <object class=\"GtkWindow\" id=\"window1\">"
" <accessibility>"
" <atkproperty name=\"AtkObject::accessible_name\" translatable=\"yes\">Contacts</atkproperty>"
" <atkrelation target=\"button1\" type=\"labelled-by\"/>"
" </accessibility>"
" </object>"
"</interface>";
GtkBuilder *builder; GtkBuilder *builder;
GObject *window1, *button1; GObject *window1, *button1;
@ -1488,6 +1497,12 @@ gboolean test_widget (void)
window1 = gtk_builder_get_object (builder, "window1"); window1 = gtk_builder_get_object (builder, "window1");
gtk_widget_destroy (GTK_WIDGET (window1)); gtk_widget_destroy (GTK_WIDGET (window1));
g_object_unref (builder); g_object_unref (builder);
builder = builder_new_from_string (buffer3, -1, NULL);
window1 = gtk_builder_get_object (builder, "window1");
gtk_widget_destroy (GTK_WIDGET (window1));
g_object_unref (builder);
return TRUE; return TRUE;
} }