2001-12-10 Michael Meeks <michael@ximian.com>

[platform/core/uifw/at-spi2-atk.git] / libspi / listener.c

diff --git a/libspi/listener.c b/libspi/listener.c
index 0a804e7..9c2547c 100644 (file)
--- 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>
+#include <libspi/listener.h>
 
-/*
- * This pulls the definition for the BonoboObject (GType)
- */
-#include "listener.h"
+/* Our parent Gtk object type */
+#define PARENT_TYPE BONOBO_TYPE_OBJECT
 
-/*
- * Our parent Gtk object type
- */
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
-
-/*
- * 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);
 }
 
 /*
@@ -72,77 +59,54 @@ impl_notify_event (PortableServer_Servant     servant,
                    CORBA_Environment         *ev)
 {
 #ifdef SPI_DEBUG
-  fprintf (stderr, "notify...\n");
+  fprintf (stderr, "notify %s...\n", e->type);
   fprintf (stderr, "source name: '%s'\n",
-           Accessibility_Accessible__get_name(e->target, ev));
+           Accessibility_Accessible__get_name(e->source, ev));
   if (ev->_major != CORBA_NO_EXCEPTION) {
     fprintf(stderr,
             ("Accessibility app error: exception during event notification: %s\n"),
             CORBA_exception_id(ev));
     exit(-1);
   }
+  /*
+  fprintf (stderr, "source is component ? : %s\n",
+           Accessibility_Accessible_queryInterface (e->source,
+                                                    "IDL:Accessibility/Component:1.0",
+                                                    ev)
+           ? "yes" : "no");
+  */
 #endif
-  Accessibility_Accessible_unref(e->target, ev);
-
+  if (e->source != CORBA_OBJECT_NIL)
+    {
+      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)
-{
-        static GType type = 0;
-
-        if (!type) {
-                static const GTypeInfo tinfo = {
-                        sizeof (ListenerClass),
-                        (GBaseInitFunc) NULL,
-                        (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) listener_class_init,
-                        (GClassFinalizeFunc) NULL,
-                        NULL, /* class data */
-                        sizeof (Listener),
-                        0, /* n preallocs */
-                        (GInstanceInitFunc) listener_init,
-                        NULL /* value table */
-                };
-                /*
-                 *   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_type_unique.
-                 */
-                type = bonobo_type_unique (
-                        PARENT_TYPE,
-                        POA_Accessibility_EventListener__init,
-                        NULL,
-                        G_STRUCT_OFFSET (ListenerClass, epv),
-                        &tinfo,
-                        "Listener");
-        }
-
-        return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiListener,
+                      Accessibility_EventListener,
+                      PARENT_TYPE,
+                      spi_listener);
 
-Listener *
-listener_new (void)
+SpiListener *
+spi_listener_new (void)
 {
-    Listener *retval =
-               LISTENER (g_object_new (listener_get_type (), NULL));
+    SpiListener *retval = g_object_new (SPI_LISTENER_TYPE, NULL);
     return retval;
 }