accessible -> atspi in interface names

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index 124a711..16738bd 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -210,7 +210,7 @@ spi_app_init (AtkObject *root)
   }
   spi_dbus_initialize (&ad->droute);
   /* Below line for testing -- it should be removed once at-spi-registryd is working */
-  if (dbus_bus_request_name(ad->bus, "org.freedesktop.atspi.test", 0, &error)) printf("Got test name.\n");
+  if (dbus_bus_request_name(ad->bus, "org.freedesktop.at-spi.test", 0, &error)) printf("Got test name.\n");
 printf("droute initialized\n");
   if (!dbus_connection_try_register_fallback (ad->bus, "/org/freedesktop/atspi", &droute_vtable, &ad->droute, &error))
   {

diff --git a/libspi/accessible.c b/libspi/accessible.c
index e27c712..8d33147 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -641,7 +641,7 @@ static DRouteProperty properties[] = {
 void
 spi_initialize_accessible (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Accessible",
+  droute_add_interface (data, "org.freedesktop.atspi.Accessible",
                        methods, properties,
                        (DRouteGetDatumFunction) get_object_from_path, NULL);
 };

diff --git a/libspi/accessible.h b/libspi/accessible.h
index dbc5d54..891f419 100644 (file)
--- a/libspi/accessible.h
+++ b/libspi/accessible.h
@@ -47,6 +47,16 @@ void spi_initialize_table(DRouteData *data);
 void spi_initialize_text(DRouteData *data);
 void spi_initialize_value(DRouteData *data);
 
+typedef struct Accessibility_Event_type Accessibility_Event;
+struct Accessibility_Event_type {
+  char *type;
+  char *source;
+  char *source_name;
+  long detail1;
+  long detail2;
+  GValue any_data;
+};
+
 G_END_DECLS
 
 #endif /* SPI_ACCESSIBLE_H_ */

diff --git a/libspi/action.c b/libspi/action.c
index 4641086..7ee015e 100644 (file)
--- a/libspi/action.c
+++ b/libspi/action.c
@@ -1,4 +1,3 @@
-
 /*
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
@@ -117,7 +116,7 @@ DRouteMethod methods[] =
 void
 spi_initialize_action (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Action",
+  droute_add_interface (data, "org.freedesktop.atspi.Action",
                        methods, NULL,
                        (DRouteGetDatumFunction) get_action_from_path,
                        NULL);

diff --git a/libspi/application.c b/libspi/application.c
index c99064f..42adeba 100644 (file)
--- a/libspi/application.c
+++ b/libspi/application.c
@@ -126,7 +126,7 @@ obj_is_root (const char *path, void *user_data)
 void
 spi_initialize_application (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Application",
+  droute_add_interface (data, "org.freedesktop.atspi.Application",
                        methods, properties,
                        (DRouteGetDatumFunction) obj_is_root, NULL);
 };

diff --git a/libspi/component.c b/libspi/component.c
index 7526dc4..da54a5e 100644 (file)
--- a/libspi/component.c
+++ b/libspi/component.c
@@ -312,7 +312,7 @@ static DRouteMethod methods[] = {
 void
 spi_initialize_component (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Component",
+  droute_add_interface (data, "org.freedesktop.atspi.Component",
                        methods, NULL,
                        (DRouteGetDatumFunction) get_component_from_path,
                        NULL);

diff --git a/libspi/dbus.c b/libspi/dbus.c
index 6a258e8..b85dad2 100644 (file)
--- a/libspi/dbus.c
+++ b/libspi/dbus.c
@@ -89,7 +89,7 @@ DBusMessage *
 spi_dbus_general_error (DBusMessage * message)
 {
   return dbus_message_new_error (message,
-                                "org.freedesktop.accessibility.GeneralError",
+                                "org.freedesktop.atspi.GeneralError",
                                 "General error");
 }
 

diff --git a/libspi/document.c b/libspi/document.c
index a0ba41e..1bf323e 100644 (file)
--- a/libspi/document.c
+++ b/libspi/document.c
@@ -144,7 +144,7 @@ static DRouteMethod methods[] = {
 void
 spi_initialize_document (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Document",
+  droute_add_interface (data, "org.freedesktop.atspi.Document",
                        methods, NULL,
                        (DRouteGetDatumFunction) get_document_from_path,
                        NULL);

diff --git a/libspi/editabletext.c b/libspi/editabletext.c
index 2e82cc3..667614a 100644 (file)
--- a/libspi/editabletext.c
+++ b/libspi/editabletext.c
@@ -263,7 +263,7 @@ static DRouteMethod methods[] = {
 void
 spi_initialize_editabletext (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.EditableText",
+  droute_add_interface (data, "org.freedesktop.atspi.EditableText",
                        methods, NULL,
                        (DRouteGetDatumFunction) get_editable_from_path,
                        NULL);

diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c
index 8491163..6fc93a4 100644 (file)
--- a/libspi/hyperlink.c
+++ b/libspi/hyperlink.c
@@ -186,7 +186,7 @@ static DRouteProperty properties[] = {
 void
 spi_initialize_hyperlink (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Hyperlink",
+  droute_add_interface (data, "org.freedesktop.atspi.Hyperlink",
                        methods, properties,
                        (DRouteGetDatumFunction) get_hyperlink_from_path,
                        NULL);

diff --git a/libspi/hypertext.c b/libspi/hypertext.c
index 6152235..ca61853 100644 (file)
--- a/libspi/hypertext.c
+++ b/libspi/hypertext.c
@@ -120,7 +120,7 @@ static DRouteMethod methods[] = {
 void
 spi_initialize_hypertext (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Hypertext",
+  droute_add_interface (data, "org.freedesktop.atspi.Hypertext",
                        methods, NULL,
                        (DRouteGetDatumFunction) get_hypertext_from_path,
                        NULL);

diff --git a/libspi/image.c b/libspi/image.c
index 4557ff6..9ac31dc 100644 (file)
--- a/libspi/image.c
+++ b/libspi/image.c
@@ -175,7 +175,7 @@ static DRouteProperty properties[] = {
 void
 spi_initialize_image (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Image", methods,
+  droute_add_interface (data, "org.freedesktop.atspi.Image", methods,
                        properties,
                        (DRouteGetDatumFunction) get_image_from_path, NULL);
 };

diff --git a/libspi/selection.c b/libspi/selection.c
index 87d57fa..d961351 100644 (file)
--- a/libspi/selection.c
+++ b/libspi/selection.c
@@ -273,7 +273,7 @@ static DRouteProperty properties[] = {
 void
 spi_initialize_selection (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Selection",
+  droute_add_interface (data, "org.freedesktop.atspi.Selection",
                        methods, properties,
                        (DRouteGetDatumFunction) get_selection_from_path,
                        NULL);

diff --git a/libspi/table.c b/libspi/table.c
index 3c7a213..09392db 100644 (file)
--- a/libspi/table.c
+++ b/libspi/table.c
@@ -775,7 +775,7 @@ static DRouteProperty properties[] = {
 void
 spi_initialize_table (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Table", methods,
+  droute_add_interface (data, "org.freedesktop.atspi.Table", methods,
                        properties,
                        (DRouteGetDatumFunction) get_table_from_path, NULL);
 };

diff --git a/libspi/text.c b/libspi/text.c
index 2bff585..8bfff4e 100644 (file)
--- a/libspi/text.c
+++ b/libspi/text.c
@@ -897,7 +897,7 @@ static DRouteProperty properties[] = {
 void
 spi_initialize_text (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Text", methods,
+  droute_add_interface (data, "org.freedesktop.atspi.Text", methods,
                        properties,
                        (DRouteGetDatumFunction) get_text_from_path, NULL);
 };

diff --git a/libspi/value.c b/libspi/value.c
index b9ff9e5..d085d6e 100644 (file)
--- a/libspi/value.c
+++ b/libspi/value.c
@@ -304,7 +304,7 @@ static DRouteProperty properties[] = {
 void
 spi_initialize_value (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.accessibility.Value", NULL,
+  droute_add_interface (data, "org.freedesktop.atspi.Value", NULL,
                        properties,
                        (DRouteGetDatumFunction) get_value_from_path, NULL);
 };

diff --git a/tools/c-constants-generator.xsl b/tools/c-constants-generator.xsl
index 992de8f..39168ce 100644 (file)
--- a/tools/c-constants-generator.xsl
+++ b/tools/c-constants-generator.xsl
@@ -89,7 +89,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <xsl:variable name="suffix">
       <xsl:choose>
         <xsl:when test="ancestor::interface">
-          <xsl:value-of select="concat(str:replace(ancestor::interface/@name, 'org.freedesktop.accessibility.', ''), '_', @suffix)"/>
+          <xsl:value-of select="concat(str:replace(ancestor::interface/@name, 'org.freedesktop.atspi.', ''), '_', @suffix)"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="@suffix"/>
@@ -116,7 +116,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <xsl:variable name="name">
       <xsl:choose>
         <xsl:when test="ancestor::interface">
-          <xsl:value-of select="concat(str:replace(ancestor::interface/@name, 'org.freedesktop.accessibility.', ''), '_', @name)"/>
+          <xsl:value-of select="concat(str:replace(ancestor::interface/@name, 'org.freedesktop.atspi.', ''), '_', @name)"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="@name"/>
@@ -222,7 +222,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <xsl:variable name="suffix">
       <xsl:choose>
         <xsl:when test="ancestor::interface">
-          <xsl:value-of select="concat(str:replace(ancestor::interface/@name, 'org.freedesktop.accessibility.', ''), '_', @suffix)"/>
+          <xsl:value-of select="concat(str:replace(ancestor::interface/@name, 'org.freedesktop.atspi.', ''), '_', @suffix)"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="@suffix"/>

diff --git a/xml/Accessibility_Accessible.xml b/xml/Accessibility_Accessible.xml
index 37f7fa7..dd29cd1 100644 (file)
--- a/xml/Accessibility_Accessible.xml
+++ b/xml/Accessibility_Accessible.xml
@@ -61,7 +61,7 @@
   </tp:docstring>
   </tp:member>
 </tp:struct>
-<interface name="org.freedesktop.accessibility.Accessible">
+<interface name="org.freedesktop.atspi.Accessible">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>The base interface which is implemented by all accessible objects. 
       All objects support interfaces for querying their contained 'children' 

diff --git a/xml/Accessibility_Action.xml b/xml/Accessibility_Action.xml
index 4d7a51f..569943a 100644 (file)
--- a/xml/Accessibility_Action.xml
+++ b/xml/Accessibility_Action.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Action">
+<interface name="org.freedesktop.atspi/Action">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An interface through which a user-actionable user interface
       component can be manipulated.  Components which react to mouse or

diff --git a/xml/Accessibility_Application.xml b/xml/Accessibility_Application.xml
index a946212..001e87e 100644 (file)
--- a/xml/Accessibility_Application.xml
+++ b/xml/Accessibility_Application.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Application">
+<interface name="org.freedesktop.atspi.Application">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An interface identifying an object which is the root of the
       user interface Accessible hierarchy associated with a running application.

diff --git a/xml/Accessibility_Component.xml b/xml/Accessibility_Component.xml
index 0f6f39c..be00887 100644 (file)
--- a/xml/Accessibility_Component.xml
+++ b/xml/Accessibility_Component.xml
@@ -93,7 +93,7 @@
   </tp:docstring>
   </tp:enumvalue>
 </tp:enum>
-<interface name="org.freedesktop.accessibility.Component">
+<interface name="org.freedesktop.atspi.Component">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>The Component interface is implemented by objects which occupy on-screen space, e.g. objects
       which have onscreen visual representations.  The methods in Component allow clients to identify

diff --git a/xml/Accessibility_Document.xml b/xml/Accessibility_Document.xml
index a7b534c..61ab809 100644 (file)
--- a/xml/Accessibility_Document.xml
+++ b/xml/Accessibility_Document.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Document">
+<interface name="org.freedesktop.atspi.Document">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Primarily a 'tagging' interface which indicates the start of 
       document content in the Accessibility hierarchy.  

diff --git a/xml/Accessibility_EditableText.xml b/xml/Accessibility_EditableText.xml
index 5994924..1f3511b 100644 (file)
--- a/xml/Accessibility_EditableText.xml
+++ b/xml/Accessibility_EditableText.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.EditableText">
+<interface name="org.freedesktop.atspi.EditableText">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Derived from interface Text, EditableText provides methods for
       modifying textual content of components which support editing.

diff --git a/xml/Accessibility_Event.xml b/xml/Accessibility_Event.xml
index 31ddff8..833e427 100644 (file)
--- a/xml/Accessibility_Event.xml
+++ b/xml/Accessibility_Event.xml
@@ -122,7 +122,7 @@
   </tp:docstring>
   </tp:member>
 </tp:struct>
-<interface name="org.freedesktop.accessibility.EventListener">
+<interface name="org.freedesktop.atspi.EventListener">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>A generic interface implemented by objects for the 
       receipt of event notifications.  EventListener is the interface from which 

diff --git a/xml/Accessibility_Hyperlink.xml b/xml/Accessibility_Hyperlink.xml
index 788a48a..ae39f0d 100644 (file)
--- a/xml/Accessibility_Hyperlink.xml
+++ b/xml/Accessibility_Hyperlink.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Hyperlink">
+<interface name="org.freedesktop.atspi.Hyperlink">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Instances of Hyperlink are returned by Hypertext objects, and are
       the means by which end users and clients interact with linked, and in

diff --git a/xml/Accessibility_Hypertext.xml b/xml/Accessibility_Hypertext.xml
index 12d35c6..47fda49 100644 (file)
--- a/xml/Accessibility_Hypertext.xml
+++ b/xml/Accessibility_Hypertext.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Hypertext">
+<interface name="org.freedesktop.atspi.Hypertext">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An interface used for objects which implement linking between
       multiple resource or content locations, or multiple 'markers'

diff --git a/xml/Accessibility_Image.xml b/xml/Accessibility_Image.xml
index 2e73a68..fe4552c 100644 (file)
--- a/xml/Accessibility_Image.xml
+++ b/xml/Accessibility_Image.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Image">
+<interface name="org.freedesktop.atspi.Image">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An interface implemented by objects which render image data or 
       pictorial information to the screen.  When onscreen components include

diff --git a/xml/Accessibility_LoginHelper.xml b/xml/Accessibility_LoginHelper.xml
index 752ea67..21d199b 100644 (file)
--- a/xml/Accessibility_LoginHelper.xml
+++ b/xml/Accessibility_LoginHelper.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.LoginHelper">
+<interface name="org.freedesktop.atspi.LoginHelper">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>@brief An interface for use by assistive technologies by which
       they can access system information and services on a 'need to know'

diff --git a/xml/Accessibility_Registry.xml b/xml/Accessibility_Registry.xml
index 91ec2a9..1d0fec8 100644 (file)
--- a/xml/Accessibility_Registry.xml
+++ b/xml/Accessibility_Registry.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Registry">
+<interface name="org.freedesktop.atspi.Registry">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>The Registry is a service through which applications providing 
       accessibility services (servers) can rendezvous with consumers of those
@@ -466,7 +466,7 @@
   <tp:member type="s" tp:name="keystring"/>
   <tp:member type="i" tp:name="unused"/>
 </tp:struct>
-<interface name="org.freedesktop.accessibility.DeviceEventListener">
+<interface name="org.freedesktop.atspi.DeviceEventListener">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>This interface should be implemented by AT-SPI clients who wish to 
       make use of the DeviceEventController to receive device event notifications.
@@ -499,7 +499,7 @@
   <method name="unImplemented_6_">
   </method>
 </interface>
-<interface name="org.freedesktop.accessibility.DeviceEventController">
+<interface name="org.freedesktop.atspi.DeviceEventController">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>The interface via which clients request notification of device events, and
       through which device events may be simulated.</p>

diff --git a/xml/Accessibility_Selection.xml b/xml/Accessibility_Selection.xml
index 3450308..2967513 100644 (file)
--- a/xml/Accessibility_Selection.xml
+++ b/xml/Accessibility_Selection.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Selection">
+<interface name="org.freedesktop.atspi.Selection">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An interface which indicates that an object exposes a 'selection' model,
       allowing the selection of one or more of its children.  Read-only Selection

diff --git a/xml/Accessibility_Selector.xml b/xml/Accessibility_Selector.xml
index 50f9f57..b1860b7 100644 (file)
--- a/xml/Accessibility_Selector.xml
+++ b/xml/Accessibility_Selector.xml
@@ -36,7 +36,7 @@
   </tp:docstring>
   <arg direction="in" name="commands" type="a(si)" tp:type="CommandList"/>
 </method>
-<interface name="org.freedesktop.accessibility.Selector">
+<interface name="org.freedesktop.atspi.Selector">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>This interface is intended for use by assistive technologies
       and related user-agents.  Via this interface, an assistive technology or

diff --git a/xml/Accessibility_State.xml b/xml/Accessibility_State.xml
index 06e51d9..2da5034 100644 (file)
--- a/xml/Accessibility_State.xml
+++ b/xml/Accessibility_State.xml
@@ -313,7 +313,7 @@
   </tp:docstring>
   </tp:enumvalue>
 </tp:enum>
-<interface name="org.freedesktop.accessibility.StateSet">
+<interface name="org.freedesktop.atspi.StateSet">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>The StateSet interface encapsulates a collection of state information.
       It allows comparison of state information between object instances, and comparisons

diff --git a/xml/Accessibility_StreamableContent.xml b/xml/Accessibility_StreamableContent.xml
index ae7b19c..a6f1147 100644 (file)
--- a/xml/Accessibility_StreamableContent.xml
+++ b/xml/Accessibility_StreamableContent.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.ContentStream">
+<interface name="org.freedesktop.atspi.ContentStream">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An interface by which the requested data from a StreamableContent object
       may be read by the client.
@@ -52,7 +52,7 @@
   </tp:docstring>
   </tp:enumvalue>
 </tp:enum>
-<tp:errors xmlns="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" namespace="org.freedesktop.accessibility.error">
+<tp:errors xmlns="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" namespace="org.freedesktop.atspi.error">
   <tp:error name="IOError">
   <tp:docstring>
     Indicates that a transmission error has occurred while reading or seeking the stream or data source. 
@@ -86,9 +86,9 @@
   </tp:docstring>
   </arg>
   <tp:possible-errors>
-    <tp:error name="org.freedesktop.accessibility.error.(NoPermission"/>
-    <tp:error name="org.freedesktop.accessibility.error.IOError"/>
-    <tp:error name="org.freedesktop.accessibility.error.NotSupported"/>
+    <tp:error name="org.freedesktop.atspi.error.(NoPermission"/>
+    <tp:error name="org.freedesktop.atspi.error.IOError"/>
+    <tp:error name="org.freedesktop.atspi.error.NotSupported"/>
   </tp:possible-errors>
 </method>
 <method name="read">
@@ -103,8 +103,8 @@
   </tp:docstring>
   </arg>
   <tp:possible-errors>
-    <tp:error name="org.freedesktop.accessibility.error.(NoPermission"/>
-    <tp:error name="org.freedesktop.accessibility.error.IOError"/>
+    <tp:error name="org.freedesktop.atspi.error.(NoPermission"/>
+    <tp:error name="org.freedesktop.atspi.error.IOError"/>
   </tp:possible-errors>
 </method>
 <method name="close">
@@ -121,7 +121,7 @@
 </method>
 <method name="unimplemented2">
 </method>
-<interface name="org.freedesktop.accessibility.StreamableContent">
+<interface name="org.freedesktop.atspi.StreamableContent">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An interface whereby an object allows its backing content
       to be streamed to clients.  Negotiation of content type

diff --git a/xml/Accessibility_Table.xml b/xml/Accessibility_Table.xml
index 56761ac..d4bce8a 100644 (file)
--- a/xml/Accessibility_Table.xml
+++ b/xml/Accessibility_Table.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Table">
+<interface name="org.freedesktop.atspi.Table">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An interface used by containers whose contained data is arranged in 
       a &quot;tabular&quot; (i.e.\ row-column) fashion.  Tables may resemble a two-dimensional

diff --git a/xml/Accessibility_Text.xml b/xml/Accessibility_Text.xml
index 9f4033f..c27173f 100644 (file)
--- a/xml/Accessibility_Text.xml
+++ b/xml/Accessibility_Text.xml
@@ -103,7 +103,7 @@
   </tp:docstring>
   </tp:enumvalue>
 </tp:enum>
-<interface name="org.freedesktop.accessibility.Text">
+<interface name="org.freedesktop.atspi.Text">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>The text interface should be implemented by objects which place textual information onscreen as character
       strings or glyphs.  The text interface allows access to textual content, including display attributes and

diff --git a/xml/Accessibility_Value.xml b/xml/Accessibility_Value.xml
index aac2378..a39870c 100644 (file)
--- a/xml/Accessibility_Value.xml
+++ b/xml/Accessibility_Value.xml
@@ -19,7 +19,7 @@
     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.</p>
 </tp:license>
-<interface name="org.freedesktop.accessibility.Value">
+<interface name="org.freedesktop.atspi.Value">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An interface supporting controls which allow a
       one-dimensional, scalar quantity to be modified or which