X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Faccessibleeventlistener.c;h=4820f0bb1d53abdc583e71e8282977ff5089b200;hb=fb1e8ce4bd1b97a4029321017b414bd04cef087d;hp=c682be96d42d928873f68f7749c203ac9950b139;hpb=408978dd34f3338e49b6ace5f60b7606579ce7a9;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/accessibleeventlistener.c b/libspi/accessibleeventlistener.c
index c682be9..4820f0b 100644
--- a/libspi/accessibleeventlistener.c
+++ b/libspi/accessibleeventlistener.c
@@ -47,22 +47,22 @@
 /*
  * A pointer to our parent object class
  */
-static SpiListenerClass *spi_accessible_event_spi_listener_parent_class;
+static SpiListenerClass *spi_event_listener_parent_class;
 
 /*
  * Implemented GObject::finalize
  */
 static void
-spi_accessible_event_spi_listener_object_finalize (GObject *object)
+spi_event_listener_object_finalize (GObject *object)
 {
 #ifdef SPI_DEBUG
         fprintf(stderr, "spi_listener_object_finalize called\n");
 #endif
-        ((GObjectClass *) spi_accessible_event_spi_listener_parent_class)->finalize (object);
+        ((GObjectClass *) spi_event_listener_parent_class)->finalize (object);
 }
 
 /*
- * CORBA Accessibility::SpiListener::notifyEvent method implementation
+ * CORBA Accessibility::Listener::notifyEvent method implementation
  */
 
 static void
@@ -72,57 +72,57 @@ impl_accessible_event_notify_event (PortableServer_Servant     servant,
 {
   int n;
   int len;
-  VoidEventListenerCB cb;
-  SpiAccessibleEventListener *listener = SPI_ACCESSIBLE_EVENT_SPI_LISTENER (
+  VoidSpiEventListenerCB cb;
+  SpiEventListener *listener = SPI_ACCESSIBLE_EVENT_SPI_LISTENER (
                                        bonobo_object_from_servant (servant));
   len = g_list_length (listener->callbacks);
 
   for (n=0; n<len; ++n)
     {
-      cb =  (VoidEventListenerCB) g_list_nth_data (listener->callbacks, n);
+      cb =  (VoidSpiEventListenerCB) g_list_nth_data (listener->callbacks, n);
       if (cb)
         {
           (*cb) (e);
         }
     }
-  /* Accessibility_SpiAccessible_unref (e->source, ev); */
+  /* Accessibility_Accessible_unref (e->source, ev); */
 }
 
 static void
-spi_accessible_event_spi_listener_class_init (SpiAccessibleEventListenerClass *klass)
+spi_event_listener_class_init (SpiEventListenerClass *klass)
 {
         GObjectClass * object_class = (GObjectClass *) klass;
         SpiListenerClass * spi_listener_class = (SpiListenerClass *) klass;
         POA_Accessibility_EventListener__epv *epv = &spi_listener_class->epv;
-        spi_accessible_event_spi_listener_parent_class = g_type_class_ref (SPI_LISTENER_TYPE);
+        spi_event_listener_parent_class = g_type_class_ref (SPI_LISTENER_TYPE);
 
-        object_class->finalize = spi_accessible_event_spi_listener_object_finalize;
+        object_class->finalize = spi_event_listener_object_finalize;
 
         epv->notifyEvent = impl_accessible_event_notify_event;
 }
 
 static void
-spi_accessible_event_spi_listener_init (SpiAccessibleEventListener *listener)
+spi_event_listener_init (SpiEventListener *listener)
 {
         listener->callbacks = NULL;
 }
 
 GType
-spi_accessible_event_spi_listener_get_type (void)
+spi_event_listener_get_type (void)
 {
         static GType type = 0;
 
         if (!type) {
                 static const GTypeInfo tinfo = {
-                        sizeof (SpiAccessibleEventListenerClass),
+                        sizeof (SpiEventListenerClass),
                         (GBaseInitFunc) NULL,
                         (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) spi_accessible_event_spi_listener_class_init,
+                        (GClassInitFunc) spi_event_listener_class_init,
                         (GClassFinalizeFunc) NULL,
                         NULL, /* class data */
                         sizeof (SpiListener),
                         0, /* n preallocs */
-                        (GInstanceInitFunc) spi_accessible_event_spi_listener_init,
+                        (GInstanceInitFunc) spi_event_listener_init,
                         NULL /* value table */
                 };
                 /*
@@ -137,28 +137,28 @@ spi_accessible_event_spi_listener_get_type (void)
                         NULL,
                         G_STRUCT_OFFSET (SpiListenerClass, epv),
                         &tinfo,
-                        "SpiAccessibleEventListener");
+                        "SpiEventListener");
         }
 
         return type;
 }
 
-SpiAccessibleEventListener *
-spi_accessible_event_spi_listener_new ()
+SpiEventListener *
+spi_event_listener_new ()
 {
-    SpiAccessibleEventListener *retval =
-    SPI_ACCESSIBLE_EVENT_SPI_LISTENER (g_object_new (spi_accessible_event_spi_listener_get_type (), NULL));
+    SpiEventListener *retval =
+    SPI_ACCESSIBLE_EVENT_SPI_LISTENER (g_object_new (spi_event_listener_get_type (), NULL));
     return retval;
 }
 
-void   spi_accessible_event_spi_listener_add_callback (SpiAccessibleEventListener *listener,
-                                               VoidEventListenerCB callback)
+void   spi_event_listener_add_callback (SpiEventListener *listener,
+                                               VoidSpiEventListenerCB callback)
 {
   listener->callbacks = g_list_append (listener->callbacks, callback);
 }
 
-void   spi_accessible_event_spi_listener_remove_callback (SpiAccessibleEventListener *listener,
-                                                  VoidEventListenerCB callback)
+void   spi_event_listener_remove_callback (SpiEventListener *listener,
+                                                  VoidSpiEventListenerCB callback)
 {
   listener->callbacks = g_list_remove (listener->callbacks, callback);
 }