9 files changed, 60 insertions, 16 deletions
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c
index c7c84d9deb..da4933e647 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include "gal-a11y-util.h"
 #include "gal-a11y-e-table-click-to-add.h"
+#include "gal-a11y-e-table-click-to-add-factory.h"
 #include <gal/e-table/e-table-group.h>
 #include <gal/e-table/e-table-group-leaf.h>
 #include <gal/e-table/e-table-click-to-add.h>
@@ -313,3 +314,14 @@ gal_a11y_e_table_click_to_add_new (GObject *widget)
 
 	return ATK_OBJECT (a11y);
 }
+
+void
+gal_a11y_e_table_click_to_add_init (void)
+{
+	if (atk_get_root ())
+		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 ());
+
+}
+
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.h b/a11y/e-table/gal-a11y-e-table-click-to-add.h
index 98e3aa9b80..ea31ff6ef6 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.h
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.h
@@ -32,4 +32,5 @@ struct _GalA11yETableClickToAddClass {
 GType      gal_a11y_e_table_click_to_add_get_type  (void);
 AtkObject *gal_a11y_e_table_click_to_add_new       (GObject *widget);
 
+void       gal_a11y_e_table_click_to_add_init      (void);
 #endif /* ! __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
index 2cf407c772..2b45bfeef7 100644
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ b/a11y/e-table/gal-a11y-e-table-item.c
@@ -1302,7 +1302,9 @@ selection_is_child_selected (AtkSelection *selection, gint i)
 void
 gal_a11y_e_table_item_init (void)
 {
-        atk_registry_set_factory_type (atk_get_default_registry (),
-                                       E_TABLE_ITEM_TYPE,
-                                       gal_a11y_e_table_item_factory_get_type ());
+	if (atk_get_root ())
+		atk_registry_set_factory_type (atk_get_default_registry (),
+					E_TABLE_ITEM_TYPE,
+					gal_a11y_e_table_item_factory_get_type ());
 }
+
diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c
index 16fef97c9d..b49a8a653a 100644
--- a/a11y/e-table/gal-a11y-e-table.c
+++ b/a11y/e-table/gal-a11y-e-table.c
@@ -8,6 +8,7 @@
 
 #include <config.h>
 #include "gal-a11y-e-table.h"
+#include "gal-a11y-e-table-factory.h"
 #include "gal-a11y-e-table-item.h"
 #include "gal-a11y-util.h"
 #include <gal/e-table/e-table.h>
@@ -64,19 +65,6 @@ eti_get_accessible (ETableItem *eti, AtkObject *parent)
 	return a11y;
 }
 
-static ETableItem *
-find_table_item (ETable *table)
-{
-	if (e_table_model_row_count(table->model) < 1)
-		return NULL;
-	else {
-		if (table->group)
-			return find_first_table_item (table->group);
-	}
-
-	return NULL;
-}
-
 static gboolean 
 init_child_item (GalA11yETable *a11y)
 {
@@ -292,3 +280,14 @@ gal_a11y_e_table_new (GObject *widget)
 
 	return ATK_OBJECT (a11y);
 }
+
+void 
+gal_a11y_e_table_init (void)
+{
+	if (atk_get_root ())
+		atk_registry_set_factory_type (atk_get_default_registry (),
+						E_TABLE_TYPE,
+						gal_a11y_e_table_factory_get_type ());
+
+}
+
diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h
index 0a0901e3bc..780cff4509 100644
--- a/a11y/e-table/gal-a11y-e-table.h
+++ b/a11y/e-table/gal-a11y-e-table.h
@@ -40,4 +40,6 @@ struct _GalA11yETableClass {
 GType      gal_a11y_e_table_get_type  (void);
 AtkObject *gal_a11y_e_table_new       (GObject *table);
 
+void       gal_a11y_e_table_init (void);
+
 #endif /* ! __GAL_A11Y_E_TABLE_H__ */
diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c
index 9f371729ae..de468398ea 100644
--- a/a11y/e-table/gal-a11y-e-tree.c
+++ b/a11y/e-table/gal-a11y-e-tree.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include "gal-a11y-e-tree.h"
+#include "gal-a11y-e-tree-factory.h"
 #include "gal-a11y-util.h"
 #include "gal-a11y-e-table-item.h"
 #include <gal/e-table/e-tree.h>
@@ -162,3 +163,14 @@ gal_a11y_e_tree_new (GObject *widget)
 
 	return ATK_OBJECT (a11y);
 }
+
+void
+gal_a11y_e_tree_init (void)
+{
+	if (atk_get_root ())
+		atk_registry_set_factory_type (atk_get_default_registry (),
+					E_TREE_TYPE,
+					gal_a11y_e_tree_factory_get_type ());
+
+}
+
diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h
index 65b8deb6cf..a9468ced54 100644
--- a/a11y/e-table/gal-a11y-e-tree.h
+++ b/a11y/e-table/gal-a11y-e-tree.h
@@ -38,4 +38,6 @@ struct _GalA11yETreeClass {
 GType      gal_a11y_e_tree_get_type  (void);
 AtkObject *gal_a11y_e_tree_new       (GObject *tree);
 
+void       gal_a11y_e_tree_init      (void);
+
 #endif /* ! __GAL_A11Y_E_TREE_H__ */
diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c
index db066edd6e..2463126afa 100644
--- a/a11y/e-text/gal-a11y-e-text.c
+++ b/a11y/e-text/gal-a11y-e-text.c
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <string.h>
 #include "gal-a11y-e-text.h"
+#include "gal-a11y-e-text-factory.h"
 #include "gal-a11y-util.h"
 #include <atk/atkobject.h>
 #include <atk/atktable.h>
@@ -1119,3 +1120,14 @@ gal_a11y_e_text_get_type (void)
 
 	return type;
 }
+
+void
+gal_a11y_e_text_init (void)
+{
+	if (atk_get_root ())
+		atk_registry_set_factory_type (atk_get_default_registry (),
+					E_TYPE_TEXT,
+					gal_a11y_e_text_factory_get_type ());
+
+}
+
diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h
index 66d2d6283b..a4b204d296 100644
--- a/a11y/e-text/gal-a11y-e-text.h
+++ b/a11y/e-text/gal-a11y-e-text.h
@@ -37,4 +37,6 @@ struct _GalA11yETextClass {
 /* Standard Glib function */
 GType      gal_a11y_e_text_get_type  (void);
 
+void       gal_a11y_e_text_init (void);
+
 #endif /* ! __GAL_A11Y_E_TEXT_H__ */