3 files changed, 6 insertions, 16 deletions
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 69095c28d3..544cbcbd86 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -41,7 +41,7 @@
 #include "gal/util/e-util.h"
 #include "gal/util/e-i18n.h"
 #include "gal/util/e-marshal.h"
-#include "gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h"
+#include "gal/a11y/e-table/gal-a11y-e-table-click-to-add.h"
 
 enum {
 	CURSOR_CHANGE,
@@ -544,11 +544,7 @@ etcta_class_init (ETableClickToAddClass *klass)
 			      e_marshal_NONE__OBJECT,
 			      G_TYPE_NONE, 1, GTK_TYPE_STYLE);
 
-
-	atk_registry_set_factory_type (atk_get_default_registry (),
-					E_TABLE_CLICK_TO_ADD_TYPE,
-					gal_a11y_e_table_click_to_add_factory_get_type ());
-
+	gal_a11y_e_table_click_to_add_init ();
 }
 
 static void
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 200b78b151..3a849fbf26 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -56,7 +56,7 @@
 #include "e-table-utils.h"
 
 #include <atk/atk.h>
-#include "gal/a11y/e-table/gal-a11y-e-table-factory.h"
+#include "gal/a11y/e-table/gal-a11y-e-table.h"
 
 #define COLUMN_HEADER_HEIGHT 16
 
@@ -3343,10 +3343,7 @@ e_table_class_init (ETableClass *class)
 							      E_TABLE_MODEL_TYPE,
 							      G_PARAM_READABLE));
 
-	atk_registry_set_factory_type (atk_get_default_registry (),
-				       E_TABLE_TYPE,
-				       gal_a11y_e_table_factory_get_type ());
-
+	gal_a11y_e_table_init ();
 }
 
 E_MAKE_TYPE(e_table, "ETable", ETable, e_table_class_init, e_table_init, PARENT_TYPE)
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 83fe8ad9a6..fa3dafa2fa 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -54,7 +54,7 @@
 
 #include "e-tree.h"
 #include "gal/util/e-marshal.h"
-#include "gal/a11y/e-table/gal-a11y-e-tree-factory.h"
+#include "gal/a11y/e-table/gal-a11y-e-tree.h"
 
 #define COLUMN_HEADER_HEIGHT 16
 
@@ -3318,10 +3318,7 @@ e_tree_class_init (ETreeClass *class)
 					     10,
 					     G_PARAM_READABLE));
 
-	atk_registry_set_factory_type (atk_get_default_registry (),
-					E_TREE_TYPE,
-					gal_a11y_e_tree_factory_get_type ());
-
+	gal_a11y_e_tree_init ();
 }
 
 E_MAKE_TYPE(e_tree, "ETree", ETree, e_tree_class_init, e_tree_init, PARENT_TYPE)