Fixed what seems to have been a botched checking from Dec 21, some fixes

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

diff --git a/registryd/desktop.c b/registryd/desktop.c
index 9258398..70da90d 100644 (file)
--- a/registryd/desktop.c
+++ b/registryd/desktop.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <libbonobo.h>
-#include <libspi/desktop.h>
+#include "desktop.h"
 
 /* Our parent Gtk object type */
 #define PARENT_TYPE SPI_ACCESSIBLE_TYPE
@@ -41,11 +41,11 @@ static SpiAccessibleClass *parent_class;
 static void
 spi_desktop_init (SpiDesktop *desktop)
 {
-  spi_base_construct_default (SPI_BASE (desktop));
+  spi_base_construct (SPI_BASE (desktop), g_object_new (ATK_TYPE_OBJECT, NULL));
 
   desktop->applications = NULL;
 
-  atk_object_set_name (SPI_BASE (desktop)->atko, "main");
+  atk_object_set_name (ATK_OBJECT (SPI_BASE (desktop)->gobj), "main");
 }
 
 static void
@@ -94,9 +94,6 @@ impl_desktop_get_child_at_index (PortableServer_Servant servant,
       retval = bonobo_object_dup_ref (app->ref, ev);
       if (BONOBO_EX (ev))
         {
-          CORBA_exception_free (ev);
-         CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-                              ex_Accessibility_ChildGone, NULL);
          retval = CORBA_OBJECT_NIL;
        }
     }