X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=registryd%2Fdesktop.c;h=86cb45b4a4d7e8a3d10a93eaf9296af76d52a4df;hb=66c4375c7cd9a0a01e79f562e1bb0326fc4dcd21;hp=b359c05531699b1a16984647c3fb943ee5593b4d;hpb=5d480319bfc6e106a9cfda9cd4509ec626e9f50d;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/registryd/desktop.c b/registryd/desktop.c
index b359c05..86cb45b 100644
--- a/registryd/desktop.c
+++ b/registryd/desktop.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * desktop.c: implements Desktop.idl
+ * desktop.c: implements SpiDesktop.idl
  *
  */
 
@@ -33,7 +33,7 @@
 /*
  * This pulls the CORBA definitions for the "Accessibility::Accessible" server
  */
-#include "Desktop.h"
+#include <libspi/Accessibility.h>
 
 /*
  * This pulls the definition for the BonoboObject (Gtk Type)
@@ -43,25 +43,26 @@
 /*
  * Our parent Gtk object type
  */
-#define PARENT_TYPE ACCESSIBLE_TYPE
+#define PARENT_TYPE SPI_ACCESSIBLE_TYPE
 
 /*
  * A pointer to our parent object class
  */
-static AccessibleClass *parent_class;
+static SpiAccessibleClass *parent_class;
 
 static void
-desktop_init (Desktop  *desktop)
+spi_desktop_init (SpiDesktop  *desktop)
 {
-  ACCESSIBLE (desktop)->atko = atk_simple_object_new();
-  atk_object_set_name (ATK_OBJECT (ACCESSIBLE (desktop)->atko), "main");
+  SPI_ACCESSIBLE (desktop)->atko = g_object_new (atk_object_get_type(), NULL);
+  desktop->applications = NULL;
+  atk_object_set_name (ATK_OBJECT (SPI_ACCESSIBLE (desktop)->atko), "main");
 }
 
 static CORBA_long
 impl_desktop_get_child_count (PortableServer_Servant servant,
                               CORBA_Environment * ev)
 {
-  Desktop *desktop = DESKTOP (bonobo_object_from_servant (servant));
+  SpiDesktop *desktop = SPI_DESKTOP (bonobo_object_from_servant (servant));
   if (desktop->applications)
     {
       return g_list_length (desktop->applications);
@@ -77,7 +78,7 @@ impl_desktop_get_child_at_index (PortableServer_Servant servant,
                                  const CORBA_long index,
                                  CORBA_Environment * ev)
 {
-  Desktop *desktop = DESKTOP (bonobo_object_from_servant (servant));
+  SpiDesktop *desktop = SPI_DESKTOP (bonobo_object_from_servant (servant));
   CORBA_Object retval;
   if ((desktop->applications) && (index < g_list_length (desktop->applications)))
     {
@@ -97,57 +98,57 @@ impl_desktop_get_child_at_index (PortableServer_Servant servant,
 }
 
 static void
-desktop_class_init (DesktopClass  *klass)
+spi_desktop_class_init (SpiDesktopClass  *klass)
 {
-        AccessibleClass * accessible_class = (AccessibleClass *) klass;
-        POA_Accessibility_Accessible__epv *epv = &accessible_class->epv;
+        SpiAccessibleClass * spi_accessible_class = (SpiAccessibleClass *) klass;
+        POA_Accessibility_Accessible__epv *epv = &spi_accessible_class->epv;
 
-        parent_class = g_type_class_ref (ACCESSIBLE_TYPE);
+        parent_class = g_type_class_ref (SPI_ACCESSIBLE_TYPE);
 
         epv->_get_childCount = impl_desktop_get_child_count;
         epv->getChildAtIndex = impl_desktop_get_child_at_index;
 }
 
 GType
-desktop_get_type (void)
+spi_desktop_get_type (void)
 {
         static GType type = 0;
 
         if (!type) {
                 static const GTypeInfo tinfo = {
-                        sizeof (DesktopClass),
+                        sizeof (SpiDesktopClass),
                         (GBaseInitFunc) NULL,
                         (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) desktop_class_init,
+                        (GClassInitFunc) spi_desktop_class_init,
                         (GClassFinalizeFunc) NULL,
                         NULL, /* class data */
-                        sizeof (Desktop),
+                        sizeof (SpiDesktop),
                         0, /* n preallocs */
-                        (GInstanceInitFunc) desktop_init,
+                        (GInstanceInitFunc) spi_desktop_init,
                         NULL /* value table */
                 };
                 /*
-                 *   Here we use bonobo_x_type_unique instead of
+                 *   Here we use bonobo_type_unique instead of
                  * gtk_type_unique, this auto-generates a load of
                  * CORBA structures for us. All derived types must
-                 * use bonobo_x_type_unique.
+                 * use bonobo_type_unique.
                  */
-                type = bonobo_x_type_unique (
+                type = bonobo_type_unique (
                         PARENT_TYPE,
                         POA_Accessibility_Desktop__init,
                         NULL,
-                        G_STRUCT_OFFSET (DesktopClass, epv),
+                        G_STRUCT_OFFSET (SpiDesktopClass, epv),
                         &tinfo,
-                        "Desktop");
+                        "SpiDesktop");
         }
 
         return type;
 }
 
-Desktop *
-desktop_new (void)
+SpiDesktop *
+spi_desktop_new (void)
 {
-    Desktop *retval =
-               DESKTOP (g_object_new (desktop_get_type (), NULL));
+    SpiDesktop *retval =
+               SPI_DESKTOP (g_object_new (spi_desktop_get_type (), NULL));
     return retval;
 }