Started fixing IDL docs.

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

diff --git a/libspi/eventlistener.c b/libspi/eventlistener.c
index 4820f0b..cf30cd4 100644 (file)
--- a/libspi/eventlistener.c
+++ b/libspi/eventlistener.c
@@ -20,33 +20,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/*
- * accessibleeventlistener.c: bonobo implementation of SpiListener.idl,
- *   with added ability to attach/remove in-process callbacks.
- *
- */
+/* accessibleeventlistener.c: implementation of SpiListener.idl */
 
+#include <config.h>
 #ifdef SPI_DEBUG
 #include <stdio.h>
 #endif
+#include <libspi/accessibleeventlistener.h>
 
-#include <config.h>
-#include <bonobo/Bonobo.h>
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition for the BonoboObject (GType)
- */
-#include "accessibleeventlistener.h"
-
-/*
- * Our parent Gtk object type
- */
+/* Our parent Gtk object type */
 #define PARENT_TYPE SPI_LISTENER_TYPE
 
-/*
- * A pointer to our parent object class
- */
+/* A pointer to our parent object class */
 static SpiListenerClass *spi_event_listener_parent_class;
 
 /*
@@ -107,58 +92,28 @@ spi_event_listener_init (SpiEventListener *listener)
         listener->callbacks = NULL;
 }
 
-GType
-spi_event_listener_get_type (void)
-{
-        static GType type = 0;
-
-        if (!type) {
-                static const GTypeInfo tinfo = {
-                        sizeof (SpiEventListenerClass),
-                        (GBaseInitFunc) NULL,
-                        (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) spi_event_listener_class_init,
-                        (GClassFinalizeFunc) NULL,
-                        NULL, /* class data */
-                        sizeof (SpiListener),
-                        0, /* n preallocs */
-                        (GInstanceInitFunc) spi_event_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 (SpiListenerClass, epv),
-                        &tinfo,
-                        "SpiEventListener");
-        }
-
-        return type;
-}
+BONOBO_TYPE_FUNC (SpiEventListener,
+                 PARENT_TYPE,
+                 spi_event_listener);
 
 SpiEventListener *
 spi_event_listener_new ()
 {
-    SpiEventListener *retval =
-    SPI_ACCESSIBLE_EVENT_SPI_LISTENER (g_object_new (spi_event_listener_get_type (), NULL));
+    SpiEventListener *retval = g_object_new (
+           SPI_ACCESSIBLE_EVENT_SPI_LISTENER_TYPE, NULL);
     return retval;
 }
 
-void   spi_event_listener_add_callback (SpiEventListener *listener,
-                                               VoidSpiEventListenerCB callback)
+void
+spi_event_listener_add_callback (SpiEventListener *listener,
+                                VoidSpiEventListenerCB callback)
 {
   listener->callbacks = g_list_append (listener->callbacks, callback);
 }
 
-void   spi_event_listener_remove_callback (SpiEventListener *listener,
-                                                  VoidSpiEventListenerCB callback)
+void
+spi_event_listener_remove_callback (SpiEventListener *listener,
+                                   VoidSpiEventListenerCB callback)
 {
   listener->callbacks = g_list_remove (listener->callbacks, callback);
 }