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

diff --git a/libspi/keystrokelistener.c b/libspi/keystrokelistener.c
index 3d8893b..c4f6a28 100644
--- a/libspi/keystrokelistener.c
+++ b/libspi/keystrokelistener.c
@@ -46,33 +46,32 @@
 /*
  * A pointer to our parent object class
  */
-static GObjectClass *keystroke_spi_listener_parent_class;
+static GObjectClass *keystroke_listener_parent_class;
 
 /*
  * Implemented GObject::finalize
  */
 static void
-keystroke_spi_listener_object_finalize (GObject *object)
+keystroke_listener_object_finalize (GObject *object)
 {
-/*        KeystrokeListener *keystroke_listener = KEYSTROKE_SPI_LISTENER (object); */
 
 #ifdef SPI_DEBUG
-        fprintf(stderr, "keystroke_spi_listener_object_finalize called\n");
+        fprintf(stderr, "keystroke_listener_object_finalize called\n");
 #endif
-        keystroke_spi_listener_parent_class->finalize (object);
+        keystroke_listener_parent_class->finalize (object);
 }
 
-void   keystroke_spi_listener_add_callback (KeystrokeListener *listener,
-					BooleanKeystrokeListenerCB callback)
+void   spi_keystroke_listener_add_callback (SpiKeystrokeListener *listener,
+					    BooleanKeystrokeListenerCB callback)
 {
   listener->callbacks = g_list_append (listener->callbacks, callback);
 #ifdef SPI_DEBUG
-        fprintf(stderr, "keystroke_spi_listener_add_callback (%p) called\n",
+        fprintf(stderr, "keystroke_listener_add_callback (%p) called\n",
 		(gpointer) callback);
 #endif
 }
 
-void   keystroke_spi_listener_remove_callback (KeystrokeListener *listener,
+void   keystroke_listener_remove_callback (SpiKeystrokeListener *listener,
 					   BooleanKeystrokeListenerCB callback)
 {
   listener->callbacks = g_list_remove (listener->callbacks, callback);
@@ -86,7 +85,7 @@ impl_key_event (PortableServer_Servant     servant,
 		const Accessibility_KeyStroke *key,
 		CORBA_Environment         *ev)
 {
-  KeystrokeListener *listener = KEYSTROKE_SPI_LISTENER (bonobo_object_from_servant (servant));
+  SpiKeystrokeListener *listener = SPI_KEYSTROKE_LISTENER (bonobo_object_from_servant (servant));
   GList *callbacks = listener->callbacks;
   gboolean was_consumed = FALSE;
 #ifdef SPI_KEYEVENT_DEBUG
@@ -98,8 +97,8 @@ impl_key_event (PortableServer_Servant     servant,
   }
   else {
     fprintf(stderr, "%s%c",
-	    (key->modifiers & KEYMASK_ALT)?"Alt-":"",
-	    ((key->modifiers & KEYMASK_SHIFT)^(key->modifiers & KEYMASK_SHIFTLOCK))?
+	    (key->modifiers & SPI_KEYMASK_ALT)?"Alt-":"",
+	    ((key->modifiers & SPI_KEYMASK_SHIFT)^(key->modifiers & SPI_KEYMASK_SHIFTLOCK))?
 	    (char) toupper((int) key->keyID) : (char) tolower((int) key->keyID));
   }
 #endif
@@ -113,39 +112,39 @@ impl_key_event (PortableServer_Servant     servant,
 }
 
 static void
-keystroke_spi_listener_class_init (KeystrokeListenerClass *klass)
+keystroke_listener_class_init (SpiKeystrokeListenerClass *klass)
 {
         GObjectClass * object_class = (GObjectClass *) klass;
         POA_Accessibility_KeystrokeListener__epv *epv = &klass->epv;
-        keystroke_spi_listener_parent_class = g_type_class_ref (BONOBO_OBJECT_TYPE);
+        keystroke_listener_parent_class = g_type_class_ref (BONOBO_OBJECT_TYPE);
 
-        object_class->finalize = keystroke_spi_listener_object_finalize;
+        object_class->finalize = keystroke_listener_object_finalize;
 
         epv->keyEvent = impl_key_event;
 }
 
 static void
-keystroke_spi_listener_init (KeystrokeListener *keystroke_listener)
+keystroke_listener_init (SpiKeystrokeListener *keystroke_listener)
 {
 	keystroke_listener->callbacks = NULL;
 }
 
 GType
-keystroke_spi_listener_get_type (void)
+spi_keystroke_listener_get_type (void)
 {
         static GType type = 0;
 
         if (!type) {
                 static const GTypeInfo tinfo = {
-                        sizeof (KeystrokeListenerClass),
+                        sizeof (SpiKeystrokeListenerClass),
                         (GBaseInitFunc) NULL,
                         (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) keystroke_spi_listener_class_init,
+                        (GClassInitFunc) keystroke_listener_class_init,
                         (GClassFinalizeFunc) NULL,
                         NULL, /* class data */
-                        sizeof (KeystrokeListener),
+                        sizeof (SpiKeystrokeListener),
                         0, /* n preallocs */
-                        (GInstanceInitFunc) keystroke_spi_listener_init,
+                        (GInstanceInitFunc) keystroke_listener_init,
                         NULL /* value table */
                 };
                 /*
@@ -158,18 +157,18 @@ keystroke_spi_listener_get_type (void)
                         PARENT_TYPE,
                         POA_Accessibility_KeystrokeListener__init,
                         NULL,
-                        G_STRUCT_OFFSET (KeystrokeListenerClass, epv),
+                        G_STRUCT_OFFSET (SpiKeystrokeListenerClass, epv),
                         &tinfo,
-                        "KeystrokeListener");
+                        "SpiKeystrokeListener");
         }
 
         return type;
 }
 
-KeystrokeListener *
-keystroke_spi_listener_new (void)
+SpiKeystrokeListener *
+spi_keystroke_listener_new (void)
 {
-    KeystrokeListener *retval =
-               KEYSTROKE_SPI_LISTENER (g_object_new (keystroke_spi_listener_get_type (), NULL));
+    SpiKeystrokeListener *retval =
+               SPI_KEYSTROKE_LISTENER (g_object_new (spi_keystroke_listener_get_type (), NULL));
     return retval;
 }