Add org.freedesktop.atspi.Desktop

diff --git a/registryd/desktop.c b/registryd/desktop.c
index e24357a..94f31f5 100644 (file)
--- a/registryd/desktop.c
+++ b/registryd/desktop.c
@@ -226,7 +226,7 @@ impl_desktop_get_children (DBusConnection *bus, DBusMessage *message, void *user
   reply = dbus_message_new_method_return (message);
   if (!reply) return NULL;
   dbus_message_iter_init_append (reply, &iter);
-  if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "o", &iter_array))
+  if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s", &iter_array))
   {
     goto oom;
   }
@@ -235,7 +235,7 @@ impl_desktop_get_children (DBusConnection *bus, DBusMessage *message, void *user
   {
     app = g_list_nth_data (desktop->applications, i);
     path = (app? app->path: SPI_DBUS_PATH_NULL);
-    dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_OBJECT_PATH, &path);
+    dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &path);
   }
   if (!dbus_message_iter_close_container (&iter, &iter_array))
   {
@@ -372,6 +372,6 @@ static DRouteProperty properties[] =
 void
 spi_registry_initialize_desktop_interface (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.atspi.Accessible", methods,
+  droute_add_interface (data, SPI_DBUS_INTERFACE_DESKTOP, methods,
                        properties, NULL, NULL);
 };

diff --git a/spi-common/spi-dbus.h b/spi-common/spi-dbus.h
index 8d11875..0815550 100644 (file)
--- a/spi-common/spi-dbus.h
+++ b/spi-common/spi-dbus.h
@@ -38,6 +38,7 @@ extern int _dbg;
 #define SPI_DBUS_INTERFACE_COMPONENT "org.freedesktop.atspi.Component"
 #define SPI_DBUS_INTERFACE_DEC "org.freedesktop.atspi.DeviceEventController"
 #define SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER "org.freedesktop.atspi.DeviceEventListener"
+#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_HYPERLINK "org.freedesktop.atspi.Hyperlink"

diff --git a/xml/Accessibility.xml b/xml/Accessibility.xml
index fdc0153..e079163 100644 (file)
--- a/xml/Accessibility.xml
+++ b/xml/Accessibility.xml
@@ -106,6 +106,7 @@ Boston, MA 02111-1307, USA.</p>
 <xi:include href="org.freedesktop.atspi.Application.xml"/>
 <xi:include href="Accessibility_Registry_Common.xml"/>
 <xi:include href="org.freedesktop.atspi.Registry.xml"/>
+<xi:include href="org.freedesktop.atspi.Desktop.xml"/>
 <xi:include href="org.freedesktop.atspi.DeviceEventController.xml"/>
 <xi:include href="org.freedesktop.atspi.DeviceEventListener.xml"/>
 <xi:include href="Accessibility_Relation.xml"/>

diff --git a/xml/Makefile.am b/xml/Makefile.am
index b30c0b5..163b599 100644 (file)
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -4,6 +4,7 @@ XML_SPEC= \
        org.freedesktop.atspi.Action.xml \
        org.freedesktop.atspi.Application.xml \
        org.freedesktop.atspi.Component.xml \
+       org.freedesktop.atspi.Desktop.xml \
        org.freedesktop.atspi.Document.xml \
        org.freedesktop.atspi.EditableText.xml \
        org.freedesktop.atspi.Hyperlink.xml \

diff --git a/xml/org.freedesktop.atspi.Desktop.xml b/xml/org.freedesktop.atspi.Desktop.xml
new file mode 100644 (file)
index 0000000..86a914c
--- /dev/null
+++ b/xml/org.freedesktop.atspi.Desktop.xml
@@ -0,0 +1,54 @@
+<node name="/node" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+
+<tp:title>AT-SPI - Assistive Technology Service Provider Interface </tp:title>
+<tp:copyright>Copyright 2008 Novell, Inc.</tp:copyright>
+<tp:copyright>Copyright 2001 Sun Microsystems Inc.</tp:copyright>
+<tp:license xmlns="http://www.w3.org/1999/xhtml">
+  <p>This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.</p>
+
+  <p>This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.</p>
+
+  <p>You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the
+    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.</p>
+</tp:license>
+<interface name="org.freedesktop.atspi.Desktop">
+  <tp:property name="childCount" type="i" access="read">
+  <tp:docstring>
+    childCount: the number of children contained by this object.
+  </tp:docstring>
+  </tp:property>
+  <method name="getChildren">
+    <tp:docstring>
+      Get the accessible children of this object.
+    </tp:docstring>
+    <arg direction="out" type="as" tp:type="AccessibleSet">
+    <tp:docstring>
+      the ::Accessible children of this object.
+    </tp:docstring>
+    </arg>
+  </method>
+  <method name="getChildAtIndex">
+    <tp:docstring>
+      Get the accessible child of this object at \c index.
+    </tp:docstring>
+    <arg direction="in" name="index" type="i">
+    <tp:docstring>
+      an in parameter indicating which child is requested (zero-indexed).
+    </tp:docstring>
+    </arg>
+    <arg direction="out" type="s" tp:type="Accessible">
+    <tp:docstring>
+      the 'nth' ::Accessible child of this object.
+    </tp:docstring>
+    </arg>
+  </method>
+</interface>
+</node>