Notify the registry upon initialization

[platform/core/uifw/at-spi2-atk.git] / registryd / desktop.c

diff --git a/registryd/desktop.c b/registryd/desktop.c
index be0e5b6..e24357a 100644 (file)
--- a/registryd/desktop.c
+++ b/registryd/desktop.c
@@ -49,11 +49,6 @@ static guint spi_desktop_signals[LAST_SIGNAL];
 /* Our parent Gtk object type */
 #define PARENT_TYPE SPI_ACCESSIBLE_TYPE
 
-typedef struct {
-       SpiDesktop *desktop;
-       const char *path;
-} Application;
-
 static gboolean exiting = FALSE;
 
 /* A pointer to our parent object class */
@@ -165,7 +160,7 @@ spi_desktop_dispose (GObject *object)
 
   while (desktop->applications)
     {
-      Application *app = desktop->applications->data;
+      SpiDesktopApplication *app = desktop->applications->data;
       g_assert (app != NULL);
       spi_desktop_remove_application (desktop, app->path);
     }
@@ -195,7 +190,7 @@ impl_desktop_get_child_at_index (DBusConnection *bus, DBusMessage *message, void
   SpiDesktop *desktop = SPI_REGISTRY(user_data)->desktop;
   DBusError error;
   dbus_int32_t index;
-  Application *app;
+  SpiDesktopApplication *app;
   const char *path;
   DBusMessage *reply;
 
@@ -216,6 +211,42 @@ impl_desktop_get_child_at_index (DBusConnection *bus, DBusMessage *message, void
   return reply;
 }
 
+static DBusMessage *
+impl_desktop_get_children (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+  SpiDesktop *desktop = SPI_REGISTRY(user_data)->desktop;
+  DBusError error;
+  gint count;
+  gint i;
+  SpiDesktopApplication *app;
+  const char *path;
+  DBusMessage *reply;
+  DBusMessageIter iter, iter_array;
+
+  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))
+  {
+    goto oom;
+  }
+  count = g_list_length (desktop->applications);
+  for (i = 0; i < count; i++)
+  {
+    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);
+  }
+  if (!dbus_message_iter_close_container (&iter, &iter_array))
+  {
+    goto oom;
+  }
+  return reply;
+oom:
+  // TODO: Handle out of memory
+  return reply;
+}
+
 static void
 spi_desktop_exiting (void)
 {
@@ -259,7 +290,7 @@ spi_desktop_new (void)
 }
 
 static void
-abnormal_application_termination (gpointer object, Application *app)
+abnormal_application_termination (gpointer object, SpiDesktopApplication *app)
 {
   g_return_if_fail (SPI_IS_DESKTOP (app->desktop));
 
@@ -271,13 +302,13 @@ void
 spi_desktop_add_application (SpiDesktop *desktop,
                             const char *application)
 {
-  Application       *app;
+  SpiDesktopApplication       *app;
 
   g_return_if_fail (SPI_IS_DESKTOP (desktop));
 
   spi_desktop_remove_application (desktop, application);
 
-  app = g_new (Application, 1);
+  app = g_new (SpiDesktopApplication, 1);
   app->desktop = desktop;
   app->path = application;
 
@@ -303,7 +334,7 @@ spi_desktop_remove_application (SpiDesktop *desktop,
   idx = 0;
   for (l = desktop->applications; l; l = l->next)
     {
-      Application *app = (Application *) l->data;
+      SpiDesktopApplication *app = (SpiDesktopApplication *) l->data;
 
       if (!strcmp(app->path, path))
         {
@@ -314,7 +345,7 @@ spi_desktop_remove_application (SpiDesktop *desktop,
 
   if (l)
     {
-      Application *app = (Application *) l->data;
+      SpiDesktopApplication *app = (SpiDesktopApplication *) l->data;
 
       desktop->applications = g_list_delete_link (desktop->applications, l);
 
@@ -328,6 +359,7 @@ spi_desktop_remove_application (SpiDesktop *desktop,
 static DRouteMethod methods[] =
 {
   { impl_desktop_get_child_at_index, "getChildAtIndex" },
+  { impl_desktop_get_children, "getChildren" },
   { NULL, NULL }
 };
 
@@ -340,6 +372,6 @@ static DRouteProperty properties[] =
 void
 spi_registry_initialize_desktop_interface (DRouteData * data)
 {
-  droute_add_interface (data, "org.freedesktop.atspi.Desktop", methods,
+  droute_add_interface (data, "org.freedesktop.atspi.Accessible", methods,
                        properties, NULL, NULL);
 };