X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Feditabletext.c;h=601abb6adf5ef02bcf2d146447bba256947b8730;hb=66c4375c7cd9a0a01e79f562e1bb0326fc4dcd21;hp=4c14c2000886419325249f9620007d66fd687a12;hpb=e5a9e644107d0a366d8f4036fc8d363a4ff82255;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/editabletext.c b/libspi/editabletext.c
index 4c14c20..601abb6 100644
--- a/libspi/editabletext.c
+++ b/libspi/editabletext.c
@@ -35,7 +35,7 @@
 #include <libspi/Accessibility.h>
 
 /*
- * This pulls the definition of the EditableText bonobo object
+ * This pulls the definition of the SpiEditableText bonobo object
  */
 #include "editabletext.h"
 
@@ -44,11 +44,11 @@
  */
 
 static void
-editable_text_class_init (EditableTextClass *klass);
+spi_editable_text_class_init (SpiEditableTextClass *klass);
 static void
-editable_text_init (EditableText *editable);
+spi_editable_text_init (SpiEditableText *editable);
 static void
-editable_text_finalize (GObject *obj);
+spi_editable_text_finalize (GObject *obj);
 static CORBA_boolean
 impl_setAttributes (PortableServer_Servant _servant,
 		       const CORBA_char * attributes,
@@ -84,21 +84,21 @@ impl_pasteText (PortableServer_Servant _servant,
 static GObjectClass *parent_class;
 
 GType
-editable_text_get_type (void)
+spi_editable_text_get_type (void)
 {
   static GType type = 0;
 
   if (!type) {
     static const GTypeInfo tinfo = {
-      sizeof (EditableTextClass),
+      sizeof (SpiEditableTextClass),
       (GBaseInitFunc) NULL,
       (GBaseFinalizeFunc) NULL,
-      (GClassInitFunc) editable_text_class_init,
+      (GClassInitFunc) spi_editable_text_class_init,
       (GClassFinalizeFunc) NULL,
       NULL, /* class data */
-      sizeof (EditableText),
+      sizeof (SpiEditableText),
       0, /* n preallocs */
-      (GInstanceInitFunc) editable_text_init,
+      (GInstanceInitFunc) spi_editable_text_init,
                         NULL /* value table */
     };
 
@@ -108,27 +108,26 @@ editable_text_get_type (void)
      * use bonobo_type_unique.
      */
     type = bonobo_type_unique (
-			       TEXT_TYPE,
+			       SPI_TEXT_TYPE,
 			       POA_Accessibility_EditableText__init,
 			       NULL,
-			       G_STRUCT_OFFSET (EditableTextClass, epv),
+			       G_STRUCT_OFFSET (SpiEditableTextClass, epv),
 			       &tinfo,
-			       "AccessibleEditableText");
+			       "SpiAccessibleEditableText");
   }
 
   return type;
 }
 
 static void
-editable_text_class_init (EditableTextClass *klass)
+spi_editable_text_class_init (SpiEditableTextClass *klass)
 {
   GObjectClass * object_class = (GObjectClass *) klass;
   POA_Accessibility_EditableText__epv *epv = &klass->epv;
-  parent_class = g_type_class_peek_parent (klass);
-
-  object_class->finalize = editable_text_finalize;
-
+  parent_class = g_type_interface_peek_parent (klass);
 
+  object_class->finalize = spi_editable_text_finalize;
+  
   /* Initialize epv table */
 
   epv->setAttributes = impl_setAttributes;
@@ -141,32 +140,26 @@ editable_text_class_init (EditableTextClass *klass)
 }
 
 static void
-editable_text_init (EditableText *editable)
+spi_editable_text_init (SpiEditableText *editable)
 {
 }
 
 static void
-editable_text_finalize (GObject *obj)
+spi_editable_text_finalize (GObject *obj)
 {
-  EditableText *editable = EDITABLE_TEXT(obj);
-  Text *text = TEXT(obj);
-  g_object_unref (text->atko);
-  text->atko = NULL;
   parent_class->finalize (obj);
 }
 
-EditableText *
-editable_text_interface_new (AtkObject *obj)
+SpiEditableText *
+spi_editable_text_interface_new (AtkObject *obj)
 {
-  EditableText *new_editable =
-    EDITABLE_TEXT(g_object_new (EDITABLE_TEXT_TYPE, NULL));
-  TEXT (new_editable)->atko = obj;
+  SpiEditableText *new_editable =
+    SPI_EDITABLE_TEXT(g_object_new (SPI_EDITABLE_TEXT_TYPE, NULL));
+  (SPI_TEXT (new_editable))->atko = obj;
   g_object_ref (obj);
-return new_editable;
+  return new_editable;
 }
 
-
-
 static CORBA_boolean
 impl_setAttributes (PortableServer_Servant _servant,
 		       const CORBA_char * attributes,
@@ -174,6 +167,13 @@ impl_setAttributes (PortableServer_Servant _servant,
 		       const CORBA_long endPos,
 					 CORBA_Environment * ev)
 {
+  SpiEditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
+  editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+
   g_print ("setRunAttributes not implemented.\n");
 }
 
@@ -184,8 +184,14 @@ impl_setTextContents (PortableServer_Servant _servant,
 		      const CORBA_char * newContents,
 		      CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
-  atk_editable_text_set_text_contents (ATK_EDITABLE_TEXT( TEXT (editable)->atko),
+  SpiEditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
+  editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+  
+  atk_editable_text_set_text_contents (ATK_EDITABLE_TEXT( SPI_TEXT (editable)->atko),
 				       (gchar *) newContents);
 }
 
@@ -198,8 +204,14 @@ impl_insertText (PortableServer_Servant _servant,
 		 const CORBA_long length,
 		 CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
-  atk_editable_text_insert_text (ATK_EDITABLE_TEXT( TEXT (editable)->atko),
+  SpiEditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
+  editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+
+  atk_editable_text_insert_text (ATK_EDITABLE_TEXT( SPI_TEXT (editable)->atko),
 				 (gchar *) text,
 				 (gint) length,
 				 (gint *) &position);
@@ -211,8 +223,14 @@ impl_copyText (PortableServer_Servant _servant,
 	       const CORBA_long startPos, const CORBA_long endPos,
 	       CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
-  atk_editable_text_copy_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko),
+  SpiEditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
+  editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+
+  atk_editable_text_copy_text (ATK_EDITABLE_TEXT( SPI_TEXT(editable)->atko),
 			       (gint) startPos, (gint) endPos);
 }
 
@@ -223,8 +241,14 @@ impl_cutText (PortableServer_Servant _servant,
 	      const CORBA_long startPos, const CORBA_long endPos,
 	      CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
-  atk_editable_text_cut_text (ATK_EDITABLE_TEXT(TEXT (editable)->atko),
+  SpiEditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
+  editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+
+  atk_editable_text_cut_text (ATK_EDITABLE_TEXT(SPI_TEXT (editable)->atko),
 				 (gint) startPos, (gint) endPos);
 }
 
@@ -236,8 +260,14 @@ impl_deleteText (PortableServer_Servant _servant,
 		 const CORBA_long startPos, const CORBA_long endPos,
 		 CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
-  atk_editable_text_delete_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko),
+  SpiEditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
+  editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+
+  atk_editable_text_delete_text (ATK_EDITABLE_TEXT( SPI_TEXT(editable)->atko),
 				 (gint) startPos, (gint) endPos);
 }
 
@@ -246,7 +276,13 @@ static void
 impl_pasteText (PortableServer_Servant _servant,
 		const CORBA_long position, CORBA_Environment * ev)
 {
-  EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
-  atk_editable_text_paste_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko), position);
+  SpiEditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
+  editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+
+  atk_editable_text_paste_text (ATK_EDITABLE_TEXT( SPI_TEXT(editable)->atko), position);
 }