Change the name of interfaces from org.freedesktop.atspi to

org.a11y.atspi.

diff --git a/.gitignore b/.gitignore
index 9e5ccf3..4445c47 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@ autom4te.cache
 config.h.in~
 config
 configure
-xml/introspection/org.freedesktop.atspi.*

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 9195ac2..4279d76 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -10,8 +10,7 @@ gtkmodule_LTLIBRARIES = libatk-bridge.la
 libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
                          $(ATK_CFLAGS)       \
                          -I$(top_srcdir)     \
-                         -I$(top_srcdir)/atk-adaptor/adaptors \
-                         -DATSPI_INTROSPECTION_PATH=\"$(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
+                         -I$(top_srcdir)/atk-adaptor/adaptors
 
 libatk_bridge_la_LDFLAGS = -no-undefined  \
                           -module        \

diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c
index 63942d4..5da15a9 100644 (file)
--- a/atk-adaptor/accessible-register.c
+++ b/atk-adaptor/accessible-register.c
@@ -48,7 +48,7 @@
  */
 
 #define SPI_ATK_PATH_PREFIX_LENGTH 34
-#define SPI_ATK_OBJECT_PATH_PREFIX  "/org/freedesktop/atspi/accessible/"
+#define SPI_ATK_OBJECT_PATH_PREFIX  "/org/a11y/atspi/accessible/"
 #define SPI_ATK_OBJECT_PATH_ROOT "root"
 
 #define SPI_ATK_OBJECT_REFERENCE_TEMPLATE SPI_ATK_OBJECT_PATH_PREFIX "%d"

diff --git a/atk-adaptor/adaptors/Makefile.am b/atk-adaptor/adaptors/Makefile.am
index e3f5cf9..28991fb 100644 (file)
--- a/atk-adaptor/adaptors/Makefile.am
+++ b/atk-adaptor/adaptors/Makefile.am
@@ -4,8 +4,7 @@ libatk_bridge_adaptors_la_CFLAGS =\
                          $(DBUS_GLIB_CFLAGS) \
                          $(ATK_CFLAGS)       \
                          -I$(top_srcdir)     \
-                         -I$(top_srcdir)/atk-adaptor\
-                         -DATSPI_INTROSPECTION_PATH=\"$(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
+                         -I$(top_srcdir)/atk-adaptor
 
 libatk_bridge_adaptors_la_LIBADD =\
                          $(DBUS_GLIB_LIBS) \

diff --git a/atk-adaptor/adaptors/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c
index 688537b..dc46850 100644 (file)
--- a/atk-adaptor/adaptors/accessible-adaptor.c
+++ b/atk-adaptor/adaptors/accessible-adaptor.c
@@ -544,6 +544,6 @@ spi_initialize_accessible (DRoutePath * path)
 {
   droute_path_add_interface (path,
                              SPI_DBUS_INTERFACE_ACCESSIBLE,
-                             spi_org_freedesktop_atspi_Accessible,     
+                             spi_org_a11y_atspi_Accessible,    
                              methods, properties);
 };

diff --git a/atk-adaptor/adaptors/action-adaptor.c b/atk-adaptor/adaptors/action-adaptor.c
index e261428..62f68f7 100644 (file)
--- a/atk-adaptor/adaptors/action-adaptor.c
+++ b/atk-adaptor/adaptors/action-adaptor.c
@@ -225,5 +225,5 @@ spi_initialize_action (DRoutePath * path)
 {
   droute_path_add_interface (path,
                              SPI_DBUS_INTERFACE_ACTION,
-                             spi_org_freedesktop_atspi_Action, methods, properties);
+                             spi_org_a11y_atspi_Action, methods, properties);
 };

diff --git a/atk-adaptor/adaptors/application-adaptor.c b/atk-adaptor/adaptors/application-adaptor.c
index efb66cb..71f146b 100644 (file)
--- a/atk-adaptor/adaptors/application-adaptor.c
+++ b/atk-adaptor/adaptors/application-adaptor.c
@@ -115,6 +115,6 @@ spi_initialize_application (DRoutePath * path)
 {
   droute_path_add_interface (path,
                              SPI_DBUS_INTERFACE_APPLICATION,
-                             spi_org_freedesktop_atspi_Application,
+                             spi_org_a11y_atspi_Application,
                              methods, properties);
 };

diff --git a/atk-adaptor/adaptors/cache-adaptor.c b/atk-adaptor/adaptors/cache-adaptor.c
index 7b863b8..04b605d 100644 (file)
--- a/atk-adaptor/adaptors/cache-adaptor.c
+++ b/atk-adaptor/adaptors/cache-adaptor.c
@@ -309,7 +309,7 @@ static DRouteMethod methods[] = {
 void
 spi_initialize_cache (DRoutePath * path)
 {
-  droute_path_add_interface (path, SPI_DBUS_INTERFACE_CACHE, spi_org_freedesktop_atspi_Cache, methods, NULL);
+  droute_path_add_interface (path, SPI_DBUS_INTERFACE_CACHE, spi_org_a11y_atspi_Cache, methods, NULL);
 
   g_signal_connect (spi_global_cache,
                     "object-added",

diff --git a/atk-adaptor/adaptors/collection-adaptor.c b/atk-adaptor/adaptors/collection-adaptor.c
index 30373fd..0edf896 100644 (file)
--- a/atk-adaptor/adaptors/collection-adaptor.c
+++ b/atk-adaptor/adaptors/collection-adaptor.c
@@ -1135,5 +1135,5 @@ void
 spi_initialize_collection (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_COLLECTION, spi_org_freedesktop_atspi_Collection, methods, NULL);
+                             SPI_DBUS_INTERFACE_COLLECTION, spi_org_a11y_atspi_Collection, methods, NULL);
 };

diff --git a/atk-adaptor/adaptors/component-adaptor.c b/atk-adaptor/adaptors/component-adaptor.c
index 863705c..2b86e94 100644 (file)
--- a/atk-adaptor/adaptors/component-adaptor.c
+++ b/atk-adaptor/adaptors/component-adaptor.c
@@ -306,5 +306,5 @@ void
 spi_initialize_component (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_COMPONENT, spi_org_freedesktop_atspi_Component, methods, NULL);
+                             SPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, NULL);
 };

diff --git a/atk-adaptor/adaptors/document-adaptor.c b/atk-adaptor/adaptors/document-adaptor.c
index fe49e17..53e35a8 100644 (file)
--- a/atk-adaptor/adaptors/document-adaptor.c
+++ b/atk-adaptor/adaptors/document-adaptor.c
@@ -117,5 +117,5 @@ void
 spi_initialize_document (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_DOCUMENT, spi_org_freedesktop_atspi_Document, methods, NULL);
+                             SPI_DBUS_INTERFACE_DOCUMENT, spi_org_a11y_atspi_Document, methods, NULL);
 };

diff --git a/atk-adaptor/adaptors/editabletext-adaptor.c b/atk-adaptor/adaptors/editabletext-adaptor.c
index 79b60c5..e633a54 100644 (file)
--- a/atk-adaptor/adaptors/editabletext-adaptor.c
+++ b/atk-adaptor/adaptors/editabletext-adaptor.c
@@ -214,5 +214,5 @@ void
 spi_initialize_editabletext (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_EDITABLE_TEXT, spi_org_freedesktop_atspi_EditableText, methods, NULL);
+                             SPI_DBUS_INTERFACE_EDITABLE_TEXT, spi_org_a11y_atspi_EditableText, methods, NULL);
 };

diff --git a/atk-adaptor/adaptors/hyperlink-adaptor.c b/atk-adaptor/adaptors/hyperlink-adaptor.c
index d48e3f3..4853848 100644 (file)
--- a/atk-adaptor/adaptors/hyperlink-adaptor.c
+++ b/atk-adaptor/adaptors/hyperlink-adaptor.c
@@ -154,6 +154,6 @@ spi_initialize_hyperlink (DRoutePath * path)
 {
   droute_path_add_interface (path,
                              SPI_DBUS_INTERFACE_HYPERLINK,
-                             spi_org_freedesktop_atspi_Hyperlink,
+                             spi_org_a11y_atspi_Hyperlink,
                              methods, properties);
 };

diff --git a/atk-adaptor/adaptors/hypertext-adaptor.c b/atk-adaptor/adaptors/hypertext-adaptor.c
index 45d5334..3cd1f36 100644 (file)
--- a/atk-adaptor/adaptors/hypertext-adaptor.c
+++ b/atk-adaptor/adaptors/hypertext-adaptor.c
@@ -108,5 +108,5 @@ void
 spi_initialize_hypertext (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_HYPERTEXT, spi_org_freedesktop_atspi_Hypertext, methods, NULL);
+                             SPI_DBUS_INTERFACE_HYPERTEXT, spi_org_a11y_atspi_Hypertext, methods, NULL);
 };

diff --git a/atk-adaptor/adaptors/image-adaptor.c b/atk-adaptor/adaptors/image-adaptor.c
index 956bb21..da56a21 100644 (file)
--- a/atk-adaptor/adaptors/image-adaptor.c
+++ b/atk-adaptor/adaptors/image-adaptor.c
@@ -139,5 +139,5 @@ void
 spi_initialize_image (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_IMAGE, spi_org_freedesktop_atspi_Image, methods, properties);
+                             SPI_DBUS_INTERFACE_IMAGE, spi_org_a11y_atspi_Image, methods, properties);
 };

diff --git a/atk-adaptor/adaptors/selection-adaptor.c b/atk-adaptor/adaptors/selection-adaptor.c
index bf12250..35bc49a 100644 (file)
--- a/atk-adaptor/adaptors/selection-adaptor.c
+++ b/atk-adaptor/adaptors/selection-adaptor.c
@@ -256,6 +256,6 @@ spi_initialize_selection (DRoutePath * path)
 {
   droute_path_add_interface (path,
                              SPI_DBUS_INTERFACE_SELECTION,
-                             spi_org_freedesktop_atspi_Selection,
+                             spi_org_a11y_atspi_Selection,
                              methods, properties);
 };

diff --git a/atk-adaptor/adaptors/table-adaptor.c b/atk-adaptor/adaptors/table-adaptor.c
index 76e4cd6..8f566e8 100644 (file)
--- a/atk-adaptor/adaptors/table-adaptor.c
+++ b/atk-adaptor/adaptors/table-adaptor.c
@@ -687,5 +687,5 @@ void
 spi_initialize_table (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_TABLE, spi_org_freedesktop_atspi_Table, methods, properties);
+                             SPI_DBUS_INTERFACE_TABLE, spi_org_a11y_atspi_Table, methods, properties);
 };

diff --git a/atk-adaptor/adaptors/text-adaptor.c b/atk-adaptor/adaptors/text-adaptor.c
index 9973fef..0fa35f9 100644 (file)
--- a/atk-adaptor/adaptors/text-adaptor.c
+++ b/atk-adaptor/adaptors/text-adaptor.c
@@ -837,5 +837,5 @@ void
 spi_initialize_text (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_TEXT, spi_org_freedesktop_atspi_Text, methods, properties);
+                             SPI_DBUS_INTERFACE_TEXT, spi_org_a11y_atspi_Text, methods, properties);
 };

diff --git a/atk-adaptor/adaptors/value-adaptor.c b/atk-adaptor/adaptors/value-adaptor.c
index 30a1a5c..71214a8 100644 (file)
--- a/atk-adaptor/adaptors/value-adaptor.c
+++ b/atk-adaptor/adaptors/value-adaptor.c
@@ -172,5 +172,5 @@ void
 spi_initialize_value (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_VALUE, spi_org_freedesktop_atspi_Value, NULL, properties);
+                             SPI_DBUS_INTERFACE_VALUE, spi_org_a11y_atspi_Value, NULL, properties);
 };

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index fd6d8fe..45bc15f 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -295,7 +295,7 @@ socket_embed_hook (AtkSocket * socket, gchar * plug_id)
     {
       DBusMessage *message;
       *(plug_path++) = '\0';
-      message = dbus_message_new_method_call (plug_name, plug_path, "org.freedesktop.atspi.Accessible", "Embedded");
+      message = dbus_message_new_method_call (plug_name, plug_path, "org.a11y.atspi.Accessible", "Embedded");
       dbus_message_append_args (message, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID);
       dbus_connection_send (spi_global_app_data->bus, message, NULL);
     }
@@ -415,7 +415,7 @@ adaptor_init (gint * argc, gchar ** argv[])
                              "/org/at_spi/cache", spi_global_cache);
 
   accpath = droute_add_many (spi_global_app_data->droute,
-                             "/org/freedesktop/atspi/accessible",
+                             "/org/a11y/atspi/accessible",
                              NULL,
                              (DRouteGetDatumFunction)
                              spi_global_register_path_to_object);

diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index c6684de..34dcda3 100644 (file)
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -39,10 +39,10 @@ static gint atk_bridge_focus_tracker_id;
 
 /*---------------------------------------------------------------------------*/
 
-#define ITF_EVENT_OBJECT   "org.freedesktop.atspi.Event.Object"
-#define ITF_EVENT_WINDOW   "org.freedesktop.atspi.Event.Window"
-#define ITF_EVENT_DOCUMENT "org.freedesktop.atspi.Event.Document"
-#define ITF_EVENT_FOCUS    "org.freedesktop.atspi.Event.Focus"
+#define ITF_EVENT_OBJECT   "org.a11y.atspi.Event.Object"
+#define ITF_EVENT_WINDOW   "org.a11y.atspi.Event.Window"
+#define ITF_EVENT_DOCUMENT "org.a11y.atspi.Event.Document"
+#define ITF_EVENT_FOCUS    "org.a11y.atspi.Event.Focus"
 
 /*---------------------------------------------------------------------------*/
 
@@ -727,7 +727,7 @@ text_selection_changed_event_listener (GSignalInvocationHint * signal_hint,
 /*
  * Children changed signal converter and forwarder.
  *
- * Klass (Interface) org.freedesktop.atspi.Event.Object
+ * Klass (Interface) org.a11y.atspi.Event.Object
  * Major is the signal name.
  * Minor is 'add' or 'remove'
  * detail1 is the index.
@@ -800,7 +800,7 @@ toplevel_removed_event_listener (AtkObject * accessible,
 /*
  * Generic signal converter and forwarder.
  *
- * Klass (Interface) org.freedesktop.atspi.Event.Object
+ * Klass (Interface) org.a11y.atspi.Event.Object
  * Major is the signal name.
  * Minor is NULL.
  * detail1 is 0.

diff --git a/atk-adaptor/introspection.c b/atk-adaptor/introspection.c
index 0fb1d9f..a4db1f2 100644 (file)
--- a/atk-adaptor/introspection.c
+++ b/atk-adaptor/introspection.c
@@ -10,8 +10,8 @@
  */
 
 
-const char *spi_org_freedesktop_atspi_Accessible = 
-"<interface name=\"org.freedesktop.atspi.Accessible\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Accessible = 
+"<interface name=\"org.a11y.atspi.Accessible\" version=\"0.1.7\">"
 ""
 "  <property access=\"read\" name=\"name\" type=\"s\" />"
 ""
@@ -68,8 +68,8 @@ const char *spi_org_freedesktop_atspi_Accessible =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Action = 
-"<interface name=\"org.freedesktop.atspi.Action\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Action = 
+"<interface name=\"org.a11y.atspi.Action\" version=\"0.1.7\">"
 ""
 "  <property access=\"read\" name=\"nActions\" type=\"i\" />"
 ""
@@ -101,8 +101,8 @@ const char *spi_org_freedesktop_atspi_Action =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Application = 
-"<interface name=\"org.freedesktop.atspi.Application\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Application = 
+"<interface name=\"org.a11y.atspi.Application\" version=\"0.1.7\">"
 ""
 "  <property access=\"read\" name=\"toolkitName\" type=\"s\" />"
 ""
@@ -118,8 +118,8 @@ const char *spi_org_freedesktop_atspi_Application =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Collection = 
-"<interface name=\"org.freedesktop.atspi.Collection\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Collection = 
+"<interface name=\"org.a11y.atspi.Collection\" version=\"0.1.7\">"
 ""
 "  <method name=\"GetMatches\">"
 "    <arg direction=\"in\" name=\"rule\" type=\"(auuasuauusub)\" />"
@@ -166,8 +166,8 @@ const char *spi_org_freedesktop_atspi_Collection =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Component = 
-"<interface name=\"org.freedesktop.atspi.Component\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Component = 
+"<interface name=\"org.a11y.atspi.Component\" version=\"0.1.7\">"
 ""
 "  <method name=\"Contains\">"
 "    <arg direction=\"in\" name=\"x\" type=\"i\" />"
@@ -220,8 +220,8 @@ const char *spi_org_freedesktop_atspi_Component =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Document = 
-"<interface name=\"org.freedesktop.atspi.Document\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Document = 
+"<interface name=\"org.a11y.atspi.Document\" version=\"0.1.7\">"
 ""
 "  <method name=\"GetLocale\">"
 "    <arg direction=\"out\" type=\"s\" />"
@@ -240,8 +240,8 @@ const char *spi_org_freedesktop_atspi_Document =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Hypertext = 
-"<interface name=\"org.freedesktop.atspi.Hypertext\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Hypertext = 
+"<interface name=\"org.a11y.atspi.Hypertext\" version=\"0.1.7\">"
 ""
 "  <method name=\"GetNLinks\">"
 "    <arg direction=\"out\" type=\"i\" />"
@@ -261,8 +261,8 @@ const char *spi_org_freedesktop_atspi_Hypertext =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Hyperlink = 
-"<interface name=\"org.freedesktop.atspi.Hyperlink\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Hyperlink = 
+"<interface name=\"org.a11y.atspi.Hyperlink\" version=\"0.1.7\">"
 ""
 "  <property access=\"read\" name=\"nAnchors\" type=\"n\" />"
 ""
@@ -288,8 +288,8 @@ const char *spi_org_freedesktop_atspi_Hyperlink =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Image = 
-"<interface name=\"org.freedesktop.atspi.Image\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Image = 
+"<interface name=\"org.a11y.atspi.Image\" version=\"0.1.7\">"
 ""
 "  <property access=\"read\" name=\"imageDescription\" type=\"s\" />"
 ""
@@ -315,8 +315,8 @@ const char *spi_org_freedesktop_atspi_Image =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Selection = 
-"<interface name=\"org.freedesktop.atspi.Selection\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Selection = 
+"<interface name=\"org.a11y.atspi.Selection\" version=\"0.1.7\">"
 ""
 "  <property access=\"read\" name=\"nSelectedChildren\" type=\"i\" />"
 ""
@@ -357,8 +357,8 @@ const char *spi_org_freedesktop_atspi_Selection =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Table = 
-"<interface name=\"org.freedesktop.atspi.Table\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Table = 
+"<interface name=\"org.a11y.atspi.Table\" version=\"0.1.7\">"
 ""
 "  <property access=\"read\" name=\"nRows\" type=\"i\" />"
 ""
@@ -492,8 +492,8 @@ const char *spi_org_freedesktop_atspi_Table =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Text = 
-"<interface name=\"org.freedesktop.atspi.Text\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Text = 
+"<interface name=\"org.a11y.atspi.Text\" version=\"0.1.7\">"
 ""
 "  <property access=\"read\" name=\"characterCount\" type=\"i\" />"
 ""
@@ -643,8 +643,8 @@ const char *spi_org_freedesktop_atspi_Text =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_EditableText = 
-"<interface name=\"org.freedesktop.atspi.EditableText\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_EditableText = 
+"<interface name=\"org.a11y.atspi.EditableText\" version=\"0.1.7\">"
 ""
 "  <method name=\"SetTextContents\">"
 "    <arg direction=\"in\" name=\"newContents\" type=\"s\" />"
@@ -683,8 +683,8 @@ const char *spi_org_freedesktop_atspi_EditableText =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Cache = 
-"<interface name=\"org.freedesktop.atspi.Cache\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Cache = 
+"<interface name=\"org.a11y.atspi.Cache\" version=\"0.1.7\">"
 ""
 "  <method name=\"GetItems\">"
 "    <arg direction=\"out\" name=\"nodes\" type=\"a((so)(so)a(so)assusau)\" />"
@@ -704,8 +704,8 @@ const char *spi_org_freedesktop_atspi_Cache =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_Value = 
-"<interface name=\"org.freedesktop.atspi.Value\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_Value = 
+"<interface name=\"org.a11y.atspi.Value\" version=\"0.1.7\">"
 ""
 "        <property access=\"read\" name=\"minimumValue\" type=\"d\" />"
 ""
@@ -718,8 +718,8 @@ const char *spi_org_freedesktop_atspi_Value =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_DeviceEventController = 
-"<interface name=\"org.freedesktop.atspi.DeviceEventController\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_DeviceEventController = 
+"<interface name=\"org.a11y.atspi.DeviceEventController\" version=\"0.1.7\">"
 ""
 "  <method name=\"RegisterKeystrokeListener\">"
 "    <arg direction=\"in\" name=\"listener\" type=\"o\" />"
@@ -782,8 +782,8 @@ const char *spi_org_freedesktop_atspi_DeviceEventController =
 "</interface>"
 "";
 
-const char *spi_org_freedesktop_atspi_DeviceEventListener = 
-"<interface name=\"org.freedesktop.atspi.DeviceEventListener\" version=\"0.1.7\">"
+const char *spi_org_a11y_atspi_DeviceEventListener = 
+"<interface name=\"org.a11y.atspi.DeviceEventListener\" version=\"0.1.7\">"
 ""
 "  <method name=\"NotifyEvent\">"
 "    <arg direction=\"in\" name=\"event\" type=\"(uinnisb)\" />"

diff --git a/atk-adaptor/introspection.h b/atk-adaptor/introspection.h
index 54f4498..8ebd641 100644 (file)
--- a/atk-adaptor/introspection.h
+++ b/atk-adaptor/introspection.h
@@ -13,39 +13,39 @@
 #define SPI_INTROSPECTION_DATA_H_
 
 
-const char *spi_org_freedesktop_atspi_Accessible;
+const char *spi_org_a11y_atspi_Accessible;
 
-const char *spi_org_freedesktop_atspi_Action;
+const char *spi_org_a11y_atspi_Action;
 
-const char *spi_org_freedesktop_atspi_Application;
+const char *spi_org_a11y_atspi_Application;
 
-const char *spi_org_freedesktop_atspi_Collection;
+const char *spi_org_a11y_atspi_Collection;
 
-const char *spi_org_freedesktop_atspi_Component;
+const char *spi_org_a11y_atspi_Component;
 
-const char *spi_org_freedesktop_atspi_Document;
+const char *spi_org_a11y_atspi_Document;
 
-const char *spi_org_freedesktop_atspi_Hypertext;
+const char *spi_org_a11y_atspi_Hypertext;
 
-const char *spi_org_freedesktop_atspi_Hyperlink;
+const char *spi_org_a11y_atspi_Hyperlink;
 
-const char *spi_org_freedesktop_atspi_Image;
+const char *spi_org_a11y_atspi_Image;
 
-const char *spi_org_freedesktop_atspi_Selection;
+const char *spi_org_a11y_atspi_Selection;
 
-const char *spi_org_freedesktop_atspi_Table;
+const char *spi_org_a11y_atspi_Table;
 
-const char *spi_org_freedesktop_atspi_Text;
+const char *spi_org_a11y_atspi_Text;
 
-const char *spi_org_freedesktop_atspi_EditableText;
+const char *spi_org_a11y_atspi_EditableText;
 
-const char *spi_org_freedesktop_atspi_Cache;
+const char *spi_org_a11y_atspi_Cache;
 
-const char *spi_org_freedesktop_atspi_Value;
+const char *spi_org_a11y_atspi_Value;
 
-const char *spi_org_freedesktop_atspi_DeviceEventController;
+const char *spi_org_a11y_atspi_DeviceEventController;
 
-const char *spi_org_freedesktop_atspi_DeviceEventListener;
+const char *spi_org_a11y_atspi_DeviceEventListener;
 
 
 #endif /* SPI_INTROSPECTION_DATA_H_ */

diff --git a/atk-adaptor/object.c b/atk-adaptor/object.c
index f495323..33c50d9 100644 (file)
--- a/atk-adaptor/object.c
+++ b/atk-adaptor/object.c
@@ -227,14 +227,14 @@ spi_object_append_interfaces (DBusMessageIter * iter, AtkObject * obj)
 #if 0
   if (ATK_IS_STREAMABLE_CONTENT (obj))
     {
-      itf = "org.freedesktop.atspi.StreamableContent";
+      itf = "org.a11y.atspi.StreamableContent";
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
     }
 #endif
 
   if (ATK_IS_DOCUMENT (obj))
     {
-      itf = "org.freedesktop.atspi.Collection";
+      itf = "org.a11y.atspi.Collection";
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);
       itf = SPI_DBUS_INTERFACE_DOCUMENT;
       dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &itf);

diff --git a/common/spi-dbus.c b/common/spi-dbus.c
index 1998582..b7dc881 100644 (file)
--- a/common/spi-dbus.c
+++ b/common/spi-dbus.c
@@ -33,7 +33,7 @@ DBusMessage *
 spi_dbus_general_error (DBusMessage * message)
 {
   return dbus_message_new_error (message,
-                                "org.freedesktop.atspi.GeneralError",
+                                "org.a11y.atspi.GeneralError",
                                 "General error");
 }
 

diff --git a/common/spi-dbus.h b/common/spi-dbus.h
index 5571ad4..da1216c 100644 (file)
--- a/common/spi-dbus.h
+++ b/common/spi-dbus.h
@@ -31,36 +31,36 @@
 
 extern int _dbg;
 
-#define SPI_DBUS_NAME_REGISTRY "org.freedesktop.atspi.Registry"
-#define SPI_DBUS_PATH_REGISTRY "/org/freedesktop/atspi/registry"
-#define SPI_DBUS_INTERFACE_REGISTRY "org.freedesktop.atspi.Registry"
+#define SPI_DBUS_NAME_REGISTRY "org.a11y.atspi.Registry"
+#define SPI_DBUS_PATH_REGISTRY "/org/a11y/atspi/registry"
+#define SPI_DBUS_INTERFACE_REGISTRY "org.a11y.atspi.Registry"
 
-#define SPI_DBUS_PATH_NULL "/org/freedesktop/atspi/null"
-#define SPI_DBUS_PATH_ROOT "/org/freedesktop/atspi/accessible/root"
+#define SPI_DBUS_PATH_NULL "/org/a11y/atspi/null"
+#define SPI_DBUS_PATH_ROOT "/org/a11y/atspi/accessible/root"
 
-#define SPI_DBUS_PATH_DEC "/org/freedesktop/atspi/registry/deviceeventcontroller"
-#define SPI_DBUS_INTERFACE_DEC "org.freedesktop.atspi.DeviceEventController"
-#define SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER "org.freedesktop.atspi.DeviceEventListener"
+#define SPI_DBUS_PATH_DEC "/org/a11y/atspi/registry/deviceeventcontroller"
+#define SPI_DBUS_INTERFACE_DEC "org.a11y.atspi.DeviceEventController"
+#define SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER "org.a11y.atspi.DeviceEventListener"
 
-#define SPI_DBUS_INTERFACE_CACHE "org.freedesktop.atspi.Cache"
-#define SPI_DBUS_INTERFACE_ACCESSIBLE "org.freedesktop.atspi.Accessible"
-#define SPI_DBUS_INTERFACE_ACTION "org.freedesktop.atspi.Action"
-#define SPI_DBUS_INTERFACE_APPLICATION "org.freedesktop.atspi.Application"
-#define SPI_DBUS_INTERFACE_COLLECTION "org.freedesktop.atspi.Collection"
-#define SPI_DBUS_INTERFACE_COMPONENT "org.freedesktop.atspi.Component"
-#define SPI_DBUS_INTERFACE_DESKTOP "org.freedesktop.atspi.Desktop"
-#define SPI_DBUS_INTERFACE_DOCUMENT "org.freedesktop.atspi.Document"
-#define SPI_DBUS_INTERFACE_EDITABLE_TEXT "org.freedesktop.atspi.EditableText"
-#define SPI_DBUS_INTERFACE_EVENT_KEYBOARD "org.freedesktop.atspi.Event.Keyboard"
-#define SPI_DBUS_INTERFACE_EVENT_MOUSE "org.freedesktop.atspi.Event.Mouse"
-#define SPI_DBUS_INTERFACE_HYPERLINK "org.freedesktop.atspi.Hyperlink"
-#define SPI_DBUS_INTERFACE_HYPERTEXT "org.freedesktop.atspi.Hypertext"
-#define SPI_DBUS_INTERFACE_IMAGE "org.freedesktop.atspi.Image"
-#define SPI_DBUS_INTERFACE_SELECTION "org.freedesktop.atspi.Selection"
-#define SPI_DBUS_INTERFACE_TABLE "org.freedesktop.atspi.Table"
-#define SPI_DBUS_INTERFACE_TEXT "org.freedesktop.atspi.Text"
-#define SPI_DBUS_INTERFACE_VALUE "org.freedesktop.atspi.Value"
-#define SPI_DBUS_INTERFACE_SOCKET "org.freedesktop.atspi.Socket"
+#define SPI_DBUS_INTERFACE_CACHE "org.a11y.atspi.Cache"
+#define SPI_DBUS_INTERFACE_ACCESSIBLE "org.a11y.atspi.Accessible"
+#define SPI_DBUS_INTERFACE_ACTION "org.a11y.atspi.Action"
+#define SPI_DBUS_INTERFACE_APPLICATION "org.a11y.atspi.Application"
+#define SPI_DBUS_INTERFACE_COLLECTION "org.a11y.atspi.Collection"
+#define SPI_DBUS_INTERFACE_COMPONENT "org.a11y.atspi.Component"
+#define SPI_DBUS_INTERFACE_DESKTOP "org.a11y.atspi.Desktop"
+#define SPI_DBUS_INTERFACE_DOCUMENT "org.a11y.atspi.Document"
+#define SPI_DBUS_INTERFACE_EDITABLE_TEXT "org.a11y.atspi.EditableText"
+#define SPI_DBUS_INTERFACE_EVENT_KEYBOARD "org.a11y.atspi.Event.Keyboard"
+#define SPI_DBUS_INTERFACE_EVENT_MOUSE "org.a11y.atspi.Event.Mouse"
+#define SPI_DBUS_INTERFACE_HYPERLINK "org.a11y.atspi.Hyperlink"
+#define SPI_DBUS_INTERFACE_HYPERTEXT "org.a11y.atspi.Hypertext"
+#define SPI_DBUS_INTERFACE_IMAGE "org.a11y.atspi.Image"
+#define SPI_DBUS_INTERFACE_SELECTION "org.a11y.atspi.Selection"
+#define SPI_DBUS_INTERFACE_TABLE "org.a11y.atspi.Table"
+#define SPI_DBUS_INTERFACE_TEXT "org.a11y.atspi.Text"
+#define SPI_DBUS_INTERFACE_VALUE "org.a11y.atspi.Value"
+#define SPI_DBUS_INTERFACE_SOCKET "org.a11y.atspi.Socket"
 
 DBusMessage *spi_dbus_general_error(DBusMessage *message);
 DBusMessage *spi_dbus_return_rect(DBusMessage *message, gint ix, gint iy, gint iwidth, gint iheight);

diff --git a/cspi/spi-event.c b/cspi/spi-event.c
index fe704a1..154df0e 100644 (file)
--- a/cspi/spi-event.c
+++ b/cspi/spi-event.c
@@ -911,7 +911,7 @@ parse_eventType (const char *eventType, char **categoryp, char **namep, char **d
   }
   if (matchrule)
   {
-    *matchrule = g_strdup_printf ("type='signal',interface='org.freedesktop.atspi.event.%c%s',member='%s'", toupper(category[0]), category + 1, name);
+    *matchrule = g_strdup_printf ("type='signal',interface='org.a11y.atspi.event.%c%s',member='%s'", toupper(category[0]), category + 1, name);
     if (!*matchrule) goto oom;
   }
   if (categoryp) *categoryp = category;

diff --git a/cspi/spi-listener.c b/cspi/spi-listener.c
index e314999..8acf3a6 100644 (file)
--- a/cspi/spi-listener.c
+++ b/cspi/spi-listener.c
@@ -373,7 +373,7 @@ cspi_dbus_handle_deviceEvent (DBusConnection *bus, DBusMessage *message, void *d
   DBusMessage *reply;
   void *p = &event;
 
-  if (sscanf (path, "/org/freedesktop/atspi/listeners/%d", &id) != 1)
+  if (sscanf (path, "/org/a11y/atspi/listeners/%d", &id) != 1)
   {
     g_warning ("Bad listener path: %s\n", path);
     goto done;

diff --git a/cspi/spi-main.c b/cspi/spi-main.c
index 2668752..e5e58cb 100644 (file)
--- a/cspi/spi-main.c
+++ b/cspi/spi-main.c
@@ -100,9 +100,9 @@ static const char *interfaces[] =
   SPI_DBUS_INTERFACE_HYPERLINK,
   SPI_DBUS_INTERFACE_HYPERTEXT,
   SPI_DBUS_INTERFACE_IMAGE,
-  "org.freedesktop.atspi.LoginHelper",
+  "org.a11y.atspi.LoginHelper",
   SPI_DBUS_INTERFACE_SELECTION,
-  "org.freedesktop.atspi.Selector",
+  "org.a11y.atspi.Selector",
   SPI_DBUS_INTERFACE_TABLE,
   SPI_DBUS_INTERFACE_TEXT,
   SPI_DBUS_INTERFACE_VALUE,
@@ -258,7 +258,7 @@ ref_accessible (CSpiApplication *app, const char *path)
   int id;
   guint *id_val;
 
-  if (sscanf (path, "/org/freedesktop/atspi/accessible/%d", &id) != 1)
+  if (sscanf (path, "/org/a11y/atspi/accessible/%d", &id) != 1)
   {
     return NULL;
   }
@@ -426,7 +426,7 @@ add_app_to_desktop (Accessible *a, const char *bus_name)
   char *root_path;
 
   dbus_error_init (&error);
-  if (dbind_method_call_reentrant (bus, bus_name, "/org/freedesktop/atspi/tree", spi_interface_tree, "getRoot", &error, "=>o", &root_path))
+  if (dbind_method_call_reentrant (bus, bus_name, "/org/a11y/atspi/tree", spi_interface_tree, "getRoot", &error, "=>o", &root_path))
   {
     Accessible *obj = cspi_ref_accessible (bus_name, root_path);
     if (obj)
@@ -533,7 +533,7 @@ ref_accessible_desktop (CSpiApplication *app)
     CSpiApplication *app = cspi_get_application (app_name);
     additions = NULL;
     dbus_error_init (&error);
-    dbind_method_call_reentrant (bus, app_name, "/org/freedesktop/atspi/tree", spi_interface_tree, "getTree", &error, "=>a(ooaoassusau)", &additions);
+    dbind_method_call_reentrant (bus, app_name, "/org/a11y/atspi/tree", spi_interface_tree, "getTree", &error, "=>a(ooaoassusau)", &additions);
     if (error.message)
     {
       g_warning ("getTree (%s): %s", app_name, error.message);
@@ -637,7 +637,7 @@ cspi_dbus_filter (DBusConnection *bus, DBusMessage *message, void *data)
   char *bus_name;
 
   if (type == DBUS_MESSAGE_TYPE_SIGNAL &&
-      !strncmp (interface, "org.freedesktop.atspi.Event.", 28))
+      !strncmp (interface, "org.a11y.atspi.Event.", 28))
   {
     return cspi_dbus_handle_event (bus, message, data);
   }
@@ -666,12 +666,12 @@ cspi_dbus_filter (DBusConnection *bus, DBusMessage *message, void *data)
 
 static const char *signal_interfaces[] =
 {
-  "org.freedesktop.atspi.Event.Object",
-  "org.freedesktop.atspi.Event.Window",
-  "org.freedesktop.atspi.Event.Mouse",
-  "org.freedesktop.atspi.Event.Terminal",
-  "org.freedesktop.atspi.Event.Document",
-  "org.freedesktop.atspi.Event.Focus",
+  "org.a11y.atspi.Event.Object",
+  "org.a11y.atspi.Event.Window",
+  "org.a11y.atspi.Event.Mouse",
+  "org.a11y.atspi.Event.Terminal",
+  "org.a11y.atspi.Event.Document",
+  "org.a11y.atspi.Event.Focus",
   NULL
 };
 
@@ -1037,7 +1037,7 @@ get_path (Accessible *obj)
   {
     return g_strdup_printf (SPI_DBUS_PATH_REGISTRY);
   }
-  return g_strdup_printf ("/org/freedesktop/atspi/accessible/%d", obj->v.id);
+  return g_strdup_printf ("/org/a11y/atspi/accessible/%d", obj->v.id);
 }
 
 dbus_bool_t

diff --git a/cspi/spi-registry.c b/cspi/spi-registry.c
index 9629c4f..d6f9469 100644 (file)
--- a/cspi/spi-registry.c
+++ b/cspi/spi-registry.c
@@ -418,5 +418,5 @@ SPI_generateMouseEvent (long x, long y, char *name)
 char *
 cspi_device_listener_get_path (CSpiDeviceListener *listener)
 {
-  return g_strdup_printf ("/org/freedesktop/atspi/listeners/%d", listener->id);
+  return g_strdup_printf ("/org/a11y/atspi/listeners/%d", listener->id);
 }