X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Flistener.c;h=b42b86514d83c0c3113bed3661536e706c8ce3e7;hb=f546ac72097fabd106a0cf277d4db389b811014c;hp=9dcdb1b3525b0d87920f91f69f67028c31f5db63;hpb=7e6b190892ea47bb90da75abcab856436a7ac222;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/listener.c b/libspi/listener.c
index 9dcdb1b..b42b865 100644
--- a/libspi/listener.c
+++ b/libspi/listener.c
@@ -20,46 +20,33 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/*
- * listener.c: test for accessibility implementation
- *
- */
+/* listener.c: implements the Listener interface */
 
 #ifdef SPI_DEBUG
 #include <stdio.h>
 #endif
 
 #include <config.h>
-#include <bonobo/Bonobo.h>
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition for the BonoboObject (GType)
- */
-#include "listener.h"
+#include <libspi/listener.h>
 
-/*
- * Our parent Gtk object type
- */
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
+/* Our parent Gtk object type */
+#define PARENT_TYPE BONOBO_TYPE_OBJECT
 
-/*
- * A pointer to our parent object class
- */
-static GObjectClass *listener_parent_class;
+/* A pointer to our parent object class */
+static GObjectClass *spi_listener_parent_class;
 
 /*
  * Implemented GObject::finalize
  */
 static void
-listener_object_finalize (GObject *object)
+spi_listener_object_finalize (GObject *object)
 {
-/*        Listener *listener = LISTENER (object); */
+/*        SpiListener *listener = SPI_LISTENER (object); */
 
 #ifdef SPI_DEBUG
-        fprintf(stderr, "listener_object_finalize called\n");
+        fprintf(stderr, "spi_listener_object_finalize called\n");
 #endif
-        listener_parent_class->finalize (object);
+        spi_listener_parent_class->finalize (object);
 }
 
 /*
@@ -88,44 +75,43 @@ impl_notify_event (PortableServer_Servant     servant,
                                                     ev)
            ? "yes" : "no");
   */
-  /* TODO: free/deref the returned interface! */
 #endif
-  Bonobo_Unknown_unref (e->source, ev);
+  Accessibility_Accessible_unref (e->source, ev);
 }
 
 static void
-listener_class_init (ListenerClass *klass)
+spi_listener_class_init (SpiListenerClass *klass)
 {
         GObjectClass * object_class = (GObjectClass *) klass;
         POA_Accessibility_EventListener__epv *epv = &klass->epv;
-        listener_parent_class = g_type_class_ref (BONOBO_OBJECT_TYPE);
+        spi_listener_parent_class = g_type_class_peek_parent (klass);
 
-        object_class->finalize = listener_object_finalize;
+        object_class->finalize = spi_listener_object_finalize;
 
         epv->notifyEvent = impl_notify_event;
 }
 
 static void
-listener_init (Listener *listener)
+spi_listener_init (SpiListener *listener)
 {
 }
 
 GType
-listener_get_type (void)
+spi_listener_get_type (void)
 {
         static GType type = 0;
 
         if (!type) {
                 static const GTypeInfo tinfo = {
-                        sizeof (ListenerClass),
+                        sizeof (SpiListenerClass),
                         (GBaseInitFunc) NULL,
                         (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) listener_class_init,
+                        (GClassInitFunc) spi_listener_class_init,
                         (GClassFinalizeFunc) NULL,
                         NULL, /* class data */
-                        sizeof (Listener),
+                        sizeof (SpiListener),
                         0, /* n preallocs */
-                        (GInstanceInitFunc) listener_init,
+                        (GInstanceInitFunc) spi_listener_init,
                         NULL /* value table */
                 };
                 /*
@@ -138,18 +124,18 @@ listener_get_type (void)
                         PARENT_TYPE,
                         POA_Accessibility_EventListener__init,
                         NULL,
-                        G_STRUCT_OFFSET (ListenerClass, epv),
+                        G_STRUCT_OFFSET (SpiListenerClass, epv),
                         &tinfo,
-                        "Listener");
+                        "SpiListener");
         }
 
         return type;
 }
 
-Listener *
-listener_new (void)
+SpiListener *
+spi_listener_new (void)
 {
-    Listener *retval =
-               LISTENER (g_object_new (listener_get_type (), NULL));
+    SpiListener *retval =
+               SPI_LISTENER (g_object_new (spi_listener_get_type (), NULL));
     return retval;
 }