added use of non-preemptive keylistener to simple-at test.

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

diff --git a/libspi/editabletext.c b/libspi/editabletext.c
index f5244a4..551e2b6 100644 (file)
--- a/libspi/editabletext.c
+++ b/libspi/editabletext.c
@@ -20,28 +20,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/*
- * component.c : bonobo wrapper for accessible component implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* editabletext.c : implements the EditableText interface */
 
+#include <config.h>
 #include <stdio.h>
+#include <libspi/editabletext.h>
 
-/*
- * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition of the SpiEditableText bonobo object
- */
-#include "editabletext.h"
-
-/*
- * Static function declarations
- */
+/* Static function declarations */
 
 static void
 spi_editable_text_class_init (SpiEditableTextClass *klass);
@@ -66,7 +51,7 @@ impl_insertText (PortableServer_Servant _servant,
                 const CORBA_long length,
                 CORBA_Environment * ev);
 static void 
-impl_copySpiText (PortableServer_Servant _servant,
+impl_copyText (PortableServer_Servant _servant,
               const CORBA_long startPos, const CORBA_long endPos,
               CORBA_Environment * ev);
 static void 
@@ -83,47 +68,17 @@ impl_pasteText (PortableServer_Servant _servant,
 
 static GObjectClass *parent_class;
 
-GType
-spi_editable_text_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type) {
-    static const GTypeInfo tinfo = {
-      sizeof (SpiEditableTextClass),
-      (GBaseInitFunc) NULL,
-      (GBaseFinalizeFunc) NULL,
-      (GClassInitFunc) spi_editable_text_class_init,
-      (GClassFinalizeFunc) NULL,
-      NULL, /* class data */
-      sizeof (SpiEditableText),
-      0, /* n preallocs */
-      (GInstanceInitFunc) spi_editable_text_init,
-                        NULL /* value table */
-    };
-
-    /*
-     * Bonobo_type_unique auto-generates a load of
-     * CORBA structures for us. All derived types must
-     * use bonobo_type_unique.
-     */
-    type = bonobo_type_unique (
-                              SPI_TEXT_TYPE,
-                              POA_Accessibility_SpiEditableText__init,
-                              NULL,
-                              G_STRUCT_OFFSET (SpiEditableTextClass, epv),
-                              &tinfo,
-                              "SpiAccessibleEditableText");
-  }
-
-  return type;
-}
+
+BONOBO_TYPE_FUNC_FULL (SpiEditableText,
+                      Accessibility_EditableText,
+                      SPI_TEXT_TYPE,
+                      spi_editable_text);
 
 static void
 spi_editable_text_class_init (SpiEditableTextClass *klass)
 {
   GObjectClass * object_class = (GObjectClass *) klass;
-  POA_Accessibility_SpiEditableText__epv *epv = &klass->epv;
+  POA_Accessibility_EditableText__epv *epv = &klass->epv;
   parent_class = g_type_interface_peek_parent (klass);
 
   object_class->finalize = spi_editable_text_finalize;
@@ -133,7 +88,7 @@ spi_editable_text_class_init (SpiEditableTextClass *klass)
   epv->setAttributes = impl_setAttributes;
   epv->setTextContents = impl_setTextContents;
   epv->insertText = impl_insertText;
-  epv->copySpiText = impl_copySpiText;
+  epv->copyText = impl_copyText;
   epv->cutText = impl_cutText;
   epv->deleteText = impl_deleteText;
   epv->pasteText = impl_pasteText;
@@ -153,8 +108,8 @@ spi_editable_text_finalize (GObject *obj)
 SpiEditableText *
 spi_editable_text_interface_new (AtkObject *obj)
 {
-  SpiEditableText *new_editable =
-    SPI_EDITABLE_TEXT(g_object_new (SPI_EDITABLE_TEXT_TYPE, NULL));
+  SpiEditableText *new_editable = g_object_new (
+         SPI_EDITABLE_TEXT_TYPE, NULL);
   (SPI_TEXT (new_editable))->atko = obj;
   g_object_ref (obj);
   return new_editable;
@@ -170,14 +125,14 @@ impl_setAttributes (PortableServer_Servant _servant,
   SpiEditableText *editable;
   BonoboObject *obj;
   obj = (bonobo_object_from_servant (_servant));
-  g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
+  g_return_val_if_fail (IS_SPI_EDITABLE_TEXT (obj), FALSE);
   editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
-  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+  g_return_val_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko), FALSE);
 
   g_print ("setRunAttributes not implemented.\n");
-}
-
 
+  return FALSE;
+}
 
 static void
 impl_setTextContents (PortableServer_Servant _servant,
@@ -219,7 +174,7 @@ impl_insertText (PortableServer_Servant _servant,
 
 
 static void 
-impl_copySpiText (PortableServer_Servant _servant,
+impl_copyText (PortableServer_Servant _servant,
               const CORBA_long startPos, const CORBA_long endPos,
               CORBA_Environment * ev)
 {