2002-04-22 jacob berkman <jacob@ximian.com>

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

diff --git a/libspi/hypertext.c b/libspi/hypertext.c
index 3aac466..c186135 100644 (file)
--- a/libspi/hypertext.c
+++ b/libspi/hypertext.c
@@ -28,12 +28,14 @@
 #include <libspi/hyperlink.h>
 #include <libspi/hypertext.h>
 
+#define PARENT_TYPE SPI_TYPE_BASE
+
 SpiHypertext *
 spi_hypertext_interface_new (AtkObject *obj)
 {
   SpiHypertext *new_hypertext = g_object_new (SPI_HYPERTEXT_TYPE, NULL);
 
-  spi_text_construct (SPI_TEXT (new_hypertext), obj);
+  spi_base_construct (SPI_BASE (new_hypertext), G_OBJECT (obj));
 
   return new_hypertext;
 }
@@ -44,12 +46,9 @@ get_hypertext_from_servant (PortableServer_Servant servant)
 {
   SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
 
-  if (!object)
-    {
-      return NULL;
-    }
-
-  return ATK_HYPERTEXT (object->atko);
+  g_return_val_if_fail (object, NULL);
+  g_return_val_if_fail (ATK_IS_OBJECT(object->gobj), NULL);
+  return ATK_HYPERTEXT (object->gobj);
 }
 
 
@@ -121,5 +120,5 @@ spi_hypertext_init (SpiHypertext *hypertext)
 
 BONOBO_TYPE_FUNC_FULL (SpiHypertext,
                       Accessibility_Hypertext,
-                      BONOBO_TYPE_OBJECT,
+                      PARENT_TYPE,
                       spi_hypertext);