Add support for checking .ui accessibility with gla11y

17 files changed, 219 insertions, 23 deletions

diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index aee23c53..d5fd158b 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -37,6 +37,8 @@ mate_about_me_LDFLAGS = -export-dynamic
 desktopdir = $(datadir)/applications
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
+include $(top_srcdir)/gla11y.mk
+
 AM_CPPFLAGS = \
 	$(MATECC_CAPPLETS_CFLAGS) \
 	$(LIBEBOOK_CFLAGS) \
@@ -50,11 +52,12 @@ AM_CPPFLAGS += \
 	$(ACCOUNTSSERVICE_CFLAGS)
 endif
 
-CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
 EXTRA_DIST = \
 	$(ui_files) \
 	fprintd-marshal.list \
 	$(Desktop_in_files) \
-	org.mate.mcc.am.gresource.xml
+	org.mate.mcc.am.gresource.xml \
+	ui-a11y.suppr
 
 -include $(top_srcdir)/git.mk
diff --git a/capplets/about-me/ui-a11y.suppr b/capplets/about-me/ui-a11y.suppr
new file mode 100644
index 00000000..b805b2ac
--- /dev/null
+++ b/capplets/about-me/ui-a11y.suppr
@@ -0,0 +1,18 @@
+mate-about-me-dialog.ui://GtkLabel[@id='fullname'] orphan-label
+mate-about-me-dialog.ui://GtkLabel[@id='label1012'] orphan-label
+mate-about-me-dialog.ui://GtkLabel[@id='login'] orphan-label
+mate-about-me-fingerprint.ui://GtkImage[@id='image'] no-labelled-by
+mate-about-me-fingerprint.ui://GtkLabel[@id='intro-label'] orphan-label
+mate-about-me-fingerprint.ui://GtkComboBox[@id='finger_combobox'] no-labelled-by
+mate-about-me-fingerprint.ui://GtkLabel[@id='enroll-label'] orphan-label
+mate-about-me-fingerprint.ui://GtkImage[@id='image1'] no-labelled-by
+mate-about-me-fingerprint.ui://GtkImage[@id='image2'] no-labelled-by
+mate-about-me-fingerprint.ui://GtkImage[@id='image3'] no-labelled-by
+mate-about-me-fingerprint.ui://GtkImage[@id='image4'] no-labelled-by
+mate-about-me-fingerprint.ui://GtkImage[@id='image5'] no-labelled-by
+mate-about-me-fingerprint.ui://GtkLabel[@id='status-label'] orphan-label
+mate-about-me-fingerprint.ui://GtkLabel[@id='page3'] orphan-label
+mate-about-me-password.ui://GtkImage[@id='dialog-image'] no-labelled-by
+mate-about-me-password.ui://GtkLabel[@id='header-label'] orphan-label
+mate-about-me-password.ui://GtkLabel[@id='description-label'] orphan-label
+mate-about-me-password.ui://GtkLabel[@id='status-label'] orphan-label
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
index a49e54b0..62b1ed5a 100644
--- a/capplets/accessibility/at-properties/Makefile.am
+++ b/capplets/accessibility/at-properties/Makefile.am
@@ -22,17 +22,20 @@ pixmap_DATA =					\
 	at-startup.png				\
 	at-support.png
 
+include $(top_srcdir)/gla11y.mk
+
 AM_CPPFLAGS   = $(AT_CAPPLET_CFLAGS)     \
              $(MATECC_CAPPLETS_CFLAGS) \
 	     -DPIXMAPDIR=\""$(pixmapdir)"\" \
 	     -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	     -DMATELOCALEDIR="\"$(datadir)/locale\""
-CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
 EXTRA_DIST = \
 	$(ui_files) \
 	$(pixmap_DATA) \
 	$(Desktop_in_files) \
-	org.mate.mcc.accessibility.at.gresource.xml
+	org.mate.mcc.accessibility.at.gresource.xml \
+	ui-a11y.suppr
 
 # Generate resources
 mate-at-properties-resources.h mate-at-properties-resources.c: org.mate.mcc.accessibility.at.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.accessibility.at.gresource.xml)
diff --git a/capplets/accessibility/at-properties/ui-a11y.suppr b/capplets/accessibility/at-properties/ui-a11y.suppr
new file mode 100644
index 00000000..e3375981
--- /dev/null
+++ b/capplets/accessibility/at-properties/ui-a11y.suppr
@@ -0,0 +1,4 @@
+at-enable-dialog.ui://GtkLabel[@id='label4'] orphan-label
+at-enable-dialog.ui://GtkImage[@id='at_enable_image'] no-labelled-by
+at-enable-dialog.ui://GtkLabel[@id='pref_label'] orphan-label
+at-enable-dialog.ui://GtkImage[@id='at_applications_image'] no-labelled-by
diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am
index 9db85374..a3849ba2 100644
--- a/capplets/appearance/data/Makefile.am
+++ b/capplets/appearance/data/Makefile.am
@@ -1,3 +1,6 @@
+ui_files = appearance.ui
+
+include $(top_srcdir)/gla11y.mk
 
 pixmapdir = $(pkgdatadir)/pixmaps
 dist_pixmap_DATA = \
@@ -41,10 +44,11 @@ if ENABLE_UPDATE_MIMEDB
 endif
 
 EXTRA_DIST = \
-	appearance.ui \
+	$(ui_files) \
 	$(xml_in_files) \
-	$(desktop_in_files)
+	$(desktop_in_files) \
+	ui-a11y.suppr
 
-CLEANFILES = $(desktop_DATA) $(mime_DATA)
+CLEANFILES = $(desktop_DATA) $(mime_DATA) $(GLA11Y_OUTPUT)
 
 -include $(top_srcdir)/git.mk
diff --git a/capplets/appearance/data/ui-a11y.suppr b/capplets/appearance/data/ui-a11y.suppr
new file mode 100644
index 00000000..ca0f35d9
--- /dev/null
+++ b/capplets/appearance/data/ui-a11y.suppr
@@ -0,0 +1,48 @@
+appearance.ui://GtkLabel[@id='label16'] orphan-label
+appearance.ui://GtkLabel[@id='label51'] orphan-label
+appearance.ui://GtkSwitch[@id='dpi_reset_switch'] no-labelled-by
+appearance.ui://GtkLabel[@id='label8'] orphan-label
+appearance.ui://GtkDrawingArea[@id='antialias_grayscale_sample'] no-labelled-by
+appearance.ui://GtkDrawingArea[@id='antialias_subpixel_sample'] no-labelled-by
+appearance.ui://GtkDrawingArea[@id='antialias_none_sample'] no-labelled-by
+appearance.ui://GtkLabel[@id='label9'] orphan-label
+appearance.ui://GtkDrawingArea[@id='hint_none_sample'] no-labelled-by
+appearance.ui://GtkDrawingArea[@id='hint_slight_sample'] no-labelled-by
+appearance.ui://GtkDrawingArea[@id='hint_full_sample'] no-labelled-by
+appearance.ui://GtkDrawingArea[@id='hint_medium_sample'] no-labelled-by
+appearance.ui://GtkLabel[@id='label10'] orphan-label
+appearance.ui://GtkImage[@id='subpixel_rgb_image'] no-labelled-by
+appearance.ui://GtkImage[@id='subpixel_bgr_image'] no-labelled-by
+appearance.ui://GtkImage[@id='subpixel_vbgr_image'] no-labelled-by
+appearance.ui://GtkImage[@id='subpixel_vrgb_image'] no-labelled-by
+appearance.ui://GtkTreeView[@id='gtk_themes_list'] no-labelled-by
+appearance.ui://GtkImage[@id='image2'] no-labelled-by
+appearance.ui://GtkLabel[@id='label_warning_color_schemes'] orphan-label
+appearance.ui://GtkColorButton[@id='tooltip_fg_color'] button-no-label
+appearance.ui://GtkColorButton[@id='selected_fg_color'] button-no-label
+appearance.ui://GtkColorButton[@id='text_color'] button-no-label
+appearance.ui://GtkColorButton[@id='fg_color'] button-no-label
+appearance.ui://GtkLabel[@id='label7'] orphan-label
+appearance.ui://GtkLabel[@id='label6'] orphan-label
+appearance.ui://GtkTreeView[@id='window_themes_list'] no-labelled-by
+appearance.ui://GtkTreeView[@id='icon_themes_list'] no-labelled-by
+appearance.ui://GtkTreeView[@id='cursor_themes_list'] no-labelled-by
+appearance.ui://GtkLabel[@id='cursor_size_small_label'] orphan-label
+appearance.ui://GtkLabel[@id='cursor_size_large_label'] orphan-label
+appearance.ui://GtkIconView[@id='theme_list'] no-labelled-by
+appearance.ui://GtkIconView[@id='wp_view'] no-labelled-by
+appearance.ui://GtkLabel[@id='label2'] orphan-label
+appearance.ui://GtkLabel[@id='label33'] orphan-label
+appearance.ui://GtkDrawingArea[@id='subpixel_sample'] no-labelled-by
+appearance.ui://GtkDrawingArea[@id='best_shapes_sample'] no-labelled-by
+appearance.ui://GtkDrawingArea[@id='monochrome_sample'] no-labelled-by
+appearance.ui://GtkDrawingArea[@id='best_contrast_sample'] no-labelled-by
+appearance.ui://GtkLabel[@id='label35'] orphan-label
+appearance.ui://GtkLabel[@id='label36'] orphan-label
+appearance.ui://GtkLabel[@id='label52'] orphan-label
+appearance.ui://GtkLabel[@id='label53'] orphan-label
+appearance.ui://GtkLabel[@id='label38'] orphan-label
+appearance.ui://GtkLabel[@id='label39'] orphan-label
+appearance.ui://GtkToolButton[@id='button2'] button-no-label
+appearance.ui://GtkToolButton[@id='button4'] button-no-label
+appearance.ui://GtkToolButton[@id='save_button'] button-no-label
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index a422d765..4adbc4fc 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -3,6 +3,8 @@ SUBDIRS = icons
 # This is used in MATECC_CAPPLETS_CFLAGS
 cappletname = mate-default-applications-properties
 
+ui_files = mate-default-applications-properties.ui
+
 bin_PROGRAMS = mate-default-applications-properties
 
 BUILT_SOURCES = \
@@ -17,6 +19,8 @@ mate_default_applications_properties_SOURCES = \
 
 @INTLTOOL_DESKTOP_RULE@
 
+include $(top_srcdir)/gla11y.mk
+
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-default-applications-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
@@ -33,7 +37,7 @@ AM_CPPFLAGS = \
 mate-default-applications-properties-resources.h mate-default-applications-properties-resources.c: org.mate.mcc.da.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.da.gresource.xml)
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name default_applications $<
 
-CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(autostart_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(autostart_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
 EXTRA_DIST = \
 	mate-default-applications.pc.in \
 	mate-default-applications-properties.ui \
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index 98cd77ce..0b776e70 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -7,6 +7,10 @@ BUILT_SOURCES = \
 	mate-display-properties-resources.h \
 	mate-display-properties-resources.c
 
+ui_files = display-capplet.ui
+
+include $(top_srcdir)/gla11y.mk
+
 bin_PROGRAMS = mate-display-properties
 
 sbin_PROGRAMS = mate-display-properties-install-systemwide
@@ -56,9 +60,9 @@ foo-marshal.h: foo-marshal.list
 mate-display-properties-resources.h mate-display-properties-resources.c: org.mate.mcc.display.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.display.gresource.xml)
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name display $<
 
-CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
 
-EXTRA_DIST = display-capplet.ui foo-marshal.list $(Desktop_in_files) org.mate.mcc.display.gresource.xml org.mate.randr.policy.in
+EXTRA_DIST = $(ui_files) foo-marshal.list $(Desktop_in_files) org.mate.mcc.display.gresource.xml org.mate.randr.policy.in ui-a11y.suppr
 DISTCLEANFILES = org.mate.randr.policy
 
 -include $(top_srcdir)/git.mk
diff --git a/capplets/display/ui-a11y.suppr b/capplets/display/ui-a11y.suppr
new file mode 100644
index 00000000..318cde7c
--- /dev/null
+++ b/capplets/display/ui-a11y.suppr
@@ -0,0 +1,2 @@
+display-capplet.ui://GtkLabel[@id='label8'] orphan-label
+display-capplet.ui://GtkLabel[@id='current_monitor_label'] orphan-label
diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
index 24c95a56..2b86f75f 100644
--- a/capplets/keybindings/Makefile.am
+++ b/capplets/keybindings/Makefile.am
@@ -1,6 +1,8 @@
 # This is used in MATECC_CAPPLETS_CFLAGS
 cappletname = keybinding
 
+ui_files = mate-keybinding-properties.ui
+
 bin_PROGRAMS = mate-keybinding-properties
 
 mate_keybinding_properties_LDADD = $(MATECC_CAPPLETS_LIBS)
@@ -16,6 +18,8 @@ mate_keybinding_properties_SOURCES = \
 
 @INTLTOOL_DESKTOP_RULE@
 
+include $(top_srcdir)/gla11y.mk
+
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-keybinding.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
@@ -40,11 +44,13 @@ CLEANFILES = \
 	$(BUILT_SOURCES) \
 	$(MATECC_CAPPLETS_CLEANFILES) \
 	$(desktop_DATA) \
-	$(xml_DATA)
+	$(xml_DATA) \
+	$(GLA11Y_OUTPUT)
 EXTRA_DIST = $(xml_in_files) \
 	mate-keybindings.pc.in \
-	mate-keybinding-properties.ui \
+	$(ui_files) \
 	$(Desktop_in_files) \
-	org.mate.mcc.keybindings.gresource.xml
+	org.mate.mcc.keybindings.gresource.xml \
+	ui-a11y.suppr
 
 -include $(top_srcdir)/git.mk
diff --git a/capplets/keybindings/ui-a11y.suppr b/capplets/keybindings/ui-a11y.suppr
new file mode 100644
index 00000000..6720b650
--- /dev/null
+++ b/capplets/keybindings/ui-a11y.suppr
@@ -0,0 +1,3 @@
+mate-keybinding-properties.ui://GtkTreeView[@id='shortcut_treeview'] no-labelled-by
+mate-keybinding-properties.ui://GtkImage[@id='image1'] no-labelled-by
+mate-keybinding-properties.ui://GtkLabel[@id='label-suggest'] orphan-label
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 30c77705..a46996d8 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -1,6 +1,13 @@
 # This is used in MATECC_CAPPLETS_CFLAGS
 cappletname = keyboard
 
+ui_files = mate-keyboard-properties-a11y-notifications.ui \
+           mate-keyboard-properties-dialog.ui \
+           mate-keyboard-properties-layout-chooser.ui \
+           mate-keyboard-properties-model-chooser.ui \
+           mate-keyboard-properties-options-dialog.ui
+
+
 bin_PROGRAMS = mate-keyboard-properties
 
 BUILT_SOURCES = mate-keyboard-properties-resources.h mate-keyboard-properties-resources.c
@@ -22,6 +29,8 @@ mate_keyboard_properties_LDADD = $(MATECC_CAPPLETS_LIBS) $(LIBMATEKBDUI_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
 
+include $(top_srcdir)/gla11y.mk
+
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-keyboard.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
@@ -36,12 +45,9 @@ AM_CPPFLAGS = \
 	-DMATECC_DATA_DIR="\"$(pkgdatadir)\""
 CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
 EXTRA_DIST = \
-	mate-keyboard-properties-a11y-notifications.ui \
-	mate-keyboard-properties-dialog.ui \
-	mate-keyboard-properties-layout-chooser.ui \
-	mate-keyboard-properties-model-chooser.ui \
-	mate-keyboard-properties-options-dialog.ui \
+	$(ui_files) \
 	$(Desktop_in_files) \
-	org.mate.mcc.keyboard.gresource.xml
+	org.mate.mcc.keyboard.gresource.xml \
+	ui-a11y.suppr
 
 -include $(top_srcdir)/git.mk
diff --git a/capplets/keyboard/ui-a11y.suppr b/capplets/keyboard/ui-a11y.suppr
new file mode 100644
index 00000000..e2c2d70c
--- /dev/null
+++ b/capplets/keyboard/ui-a11y.suppr
@@ -0,0 +1,51 @@
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label33'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label40'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label47'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label50'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label500'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label99'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label98'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label51'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label53'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label54'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label55'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label1'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label43'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='delay_short_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='repeat_slow_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='delay_long_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='repeat_fast_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label5'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label44'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='blink_fast_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='blink_slow_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label3'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label73'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label74'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label75'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label76'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='slowkeys_slow_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='slowkeys_long_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label77'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label78'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='bouncekeys_short_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='bouncekeys_long_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label80'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='mousekeys_slow_label2'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='mousekeys_fast_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='mousekeys_fast_label2'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='mousekeys_slow_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='mousekeys_short_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='mousekeys_long_label'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label45'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label39'] orphan-label
+mate-keyboard-properties-dialog.ui://GtkLabel[@id='label31'] orphan-label
+mate-keyboard-properties-layout-chooser.ui://GtkComboBox[@id='xkb_country_variants_available'] duplicate-mnemonic
+mate-keyboard-properties-layout-chooser.ui://GtkComboBox[@id='xkb_countries_available'] duplicate-mnemonic
+mate-keyboard-properties-layout-chooser.ui://GtkComboBox[@id='xkb_language_variants_available'] no-labelled-by
+mate-keyboard-properties-layout-chooser.ui://GtkComboBox[@id='xkb_languages_available'] no-labelled-by
+mate-keyboard-properties-layout-chooser.ui://GtkLabel[@id='label10'] orphan-label
+mate-keyboard-properties-model-chooser.ui://GtkLabel[@id='vendors_label'] orphan-label
+mate-keyboard-properties-model-chooser.ui://GtkTreeView[@id='vendors_list'] no-labelled-by
+mate-keyboard-properties-model-chooser.ui://GtkLabel[@id='label7'] orphan-label
+mate-keyboard-properties-model-chooser.ui://GtkTreeView[@id='models_list'] no-labelled-by
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index 158806a4..607979a7 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -1,6 +1,8 @@
 # This is used in MATECC_CAPPLETS_CFLAGS
 cappletname = mouse
 
+ui_files = mate-mouse-properties.ui
+
 bin_PROGRAMS = mate-mouse-properties
 
 mate_mouse_properties_LDADD = $(MATECC_CAPPLETS_LIBS)
@@ -20,6 +22,8 @@ pixmap_DATA = \
 	double-click-off.svg		\
 	double-click-maybe.svg
 
+include $(top_srcdir)/gla11y.mk
+
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-settings-mouse.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
@@ -31,7 +35,7 @@ AM_CPPFLAGS = \
 	$(MATECC_CAPPLETS_CFLAGS) \
 	-DMATELOCALEDIR="\"$(datadir)/locale\"" \
 	-DMATECC_DATA_DIR="\"$(pkgdatadir)\""
-CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = mate-mouse-properties.ui $(pixmap_DATA) $(Desktop_in_files) org.mate.mcc.mouse.gresource.xml
+CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
+EXTRA_DIST = $(ui_files) $(pixmap_DATA) $(Desktop_in_files) org.mate.mcc.mouse.gresource.xml ui-a11y.suppr
 
 -include $(top_srcdir)/git.mk
diff --git a/capplets/mouse/ui-a11y.suppr b/capplets/mouse/ui-a11y.suppr
new file mode 100644
index 00000000..cf515054
--- /dev/null
+++ b/capplets/mouse/ui-a11y.suppr
@@ -0,0 +1,25 @@
+mate-mouse-properties.ui://GtkLabel[@id='label27'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label5'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label29'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='acceleration_slow_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='acceleration_fast_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='sensitivity_low_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='sensitivity_high_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label8'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='threshold_small_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='threshold_large_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label31'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='timeout_short_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='timeout_long_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label33'] orphan-label
+mate-mouse-properties.ui://GtkImage[@id='double_click_image'] no-labelled-by
+mate-mouse-properties.ui://GtkLabel[@id='label18'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label6'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label9'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='multi_finger_warning'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label34'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label40'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='touchpad_acceleration_slow_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='touchpad_acceleration_fast_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='touchpad_sensitivity_low_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='touchpad_sensitivity_high_label'] orphan-label
diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am
index cb1671eb..65b7c6ec 100644
--- a/capplets/network/Makefile.am
+++ b/capplets/network/Makefile.am
@@ -1,6 +1,8 @@
 # This is used in MATECC_CAPPLETS_CFLAGS
 cappletname = network
 
+ui_files = mate-network-properties.ui
+
 bin_PROGRAMS = mate-network-properties
 
 BUILT_SOURCES = mate-network-properties-resources.h mate-network-properties-resources.c
@@ -11,6 +13,8 @@ mate_network_properties_LDADD = $(MATECC_CAPPLETS_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
 
+include $(top_srcdir)/gla11y.mk
+
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-network-properties.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -22,7 +26,7 @@ AM_CPPFLAGS = \
 	$(MATECC_CAPPLETS_CFLAGS) \
 	-DMATELOCALEDIR="\"$(datadir)/locale\""
 
-CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = mate-network-properties.ui $(desktop_in_files) org.mate.mcc.network.gresource.xml
+CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
+EXTRA_DIST = $(ui_files) $(desktop_in_files) org.mate.mcc.network.gresource.xml ui-a11y.suppr
 
 -include $(top_srcdir)/git.mk
diff --git a/capplets/network/ui-a11y.suppr b/capplets/network/ui-a11y.suppr
new file mode 100644
index 00000000..1b8700b0
--- /dev/null
+++ b/capplets/network/ui-a11y.suppr
@@ -0,0 +1,7 @@
+mate-network-properties.ui://GtkLabel[@id='label2'] orphan-label
+mate-network-properties.ui://GtkLabel[@id='label17'] orphan-label
+mate-network-properties.ui://GtkLabel[@id='label_ignore_host'] orphan-label
+mate-network-properties.ui://GtkLabel[@id='label22'] orphan-label
+mate-network-properties.ui://GtkEntry[@id='entry_url'] no-labelled-by
+mate-network-properties.ui://GtkTreeView[@id='treeview_ignore_host'] no-labelled-by
+mate-network-properties.ui://GtkLabel[@id='label19'] orphan-label