Cleaned up some suspect int* casts, and added assertions to text calls in libspi

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

diff --git a/libspi/editabletext.c b/libspi/editabletext.c
index ecc8edd..b2a1808 100644 (file)
--- a/libspi/editabletext.c
+++ b/libspi/editabletext.c
@@ -108,7 +108,7 @@ editable_text_get_type (void)
      * use bonobo_type_unique.
      */
     type = bonobo_type_unique (
-                              BONOBO_OBJECT_TYPE,
+                              TEXT_TYPE,
                               POA_Accessibility_EditableText__init,
                               NULL,
                               G_STRUCT_OFFSET (EditableTextClass, epv),
@@ -149,17 +149,20 @@ static void
 editable_text_finalize (GObject *obj)
 {
   EditableText *editable = EDITABLE_TEXT(obj);
-  editable->atk_editable_text = NULL;
+  Text *text = TEXT(obj);
+  g_object_unref (text->atko);
+  text->atko = NULL;
   parent_class->finalize (obj);
 }
 
 EditableText *
-editable_text_new (AtkEditableText *editable)
+editable_text_interface_new (AtkObject *obj)
 {
   EditableText *new_editable =
     EDITABLE_TEXT(g_object_new (EDITABLE_TEXT_TYPE, NULL));
-  new_editable->atk_editable_text = editable;
-  return new_editable;
+  TEXT (new_editable)->atko = obj;
+  g_object_ref (obj);
+return new_editable;
 }
 
 
@@ -171,6 +174,13 @@ impl_setAttributes (PortableServer_Servant _servant,
                       const CORBA_long endPos,
                                         CORBA_Environment * ev)
 {
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
   g_print ("setRunAttributes not implemented.\n");
 }
 
@@ -181,8 +191,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 (editable->atk_editable_text,
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+  
+  atk_editable_text_set_text_contents (ATK_EDITABLE_TEXT( TEXT (editable)->atko),
                                       (gchar *) newContents);
 }
 
@@ -195,8 +211,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 (editable->atk_editable_text,
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
+  atk_editable_text_insert_text (ATK_EDITABLE_TEXT( TEXT (editable)->atko),
                                 (gchar *) text,
                                 (gint) length,
                                 (gint *) &position);
@@ -208,8 +230,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 (editable->atk_editable_text,
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
+  atk_editable_text_copy_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko),
                               (gint) startPos, (gint) endPos);
 }
 
@@ -220,8 +248,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 (editable->atk_editable_text,
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
+  atk_editable_text_cut_text (ATK_EDITABLE_TEXT(TEXT (editable)->atko),
                                 (gint) startPos, (gint) endPos);
 }
 
@@ -233,8 +267,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 (editable->atk_editable_text,
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
+  atk_editable_text_delete_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko),
                                 (gint) startPos, (gint) endPos);
 }
 
@@ -243,7 +283,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 (editable->atk_editable_text, position);
+  EditableText *editable;
+  BonoboObject *obj;
+  obj = (bonobo_object_from_servant (_servant));
+  g_return_if_fail (IS_EDITABLE_TEXT (obj));
+  editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
+  g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (TEXT (obj))->atko));
+
+  atk_editable_text_paste_text (ATK_EDITABLE_TEXT( TEXT(editable)->atko), position);
 }