2002-09-13 Michael Meeks <michael@ximian.com>

[platform/upstream/at-spi2-core.git] / libspi / hyperlink.c

diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c
index 36b538d..d5596c2 100644 (file)
--- a/libspi/hyperlink.c
+++ b/libspi/hyperlink.c
@@ -2,7 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -88,7 +89,7 @@ spi_hyperlink_new (AtkObject *object)
   SpiHyperlink *new_hyperlink = g_object_new (
          SPI_HYPERLINK_TYPE, NULL);
 
-  spi_base_construct (SPI_BASE (new_hyperlink), object);
+  spi_base_construct (SPI_BASE (new_hyperlink), G_OBJECT(object));
 
   return new_hyperlink;
 }
@@ -99,12 +100,9 @@ get_hyperlink_from_servant (PortableServer_Servant servant)
 {
   SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
 
-  if (!object)
-    {
-      return NULL;
-    }
-
-  return ATK_HYPERLINK (object->atko);
+  g_return_val_if_fail (object != NULL, NULL);
+  g_return_val_if_fail (ATK_IS_OBJECT(object->gobj), NULL);
+  return ATK_HYPERLINK (object->gobj);
 }
 
 
@@ -116,7 +114,7 @@ impl__get_n_anchors (PortableServer_Servant servant,
 
   g_return_val_if_fail (link != NULL, 0);
 
-  return (CORBA_short) atk_hyperlink_get_n_anchors (link);
+  return atk_hyperlink_get_n_anchors (link);
 }
 
 
@@ -128,7 +126,7 @@ impl__get_startIndex (PortableServer_Servant servant,
 
   g_return_val_if_fail (link != NULL, -1);
 
-  return (CORBA_long) atk_hyperlink_get_start_index (link);
+  return atk_hyperlink_get_start_index (link);
 }
 
 
@@ -140,7 +138,7 @@ impl__get_endIndex (PortableServer_Servant servant,
 
   g_return_val_if_fail (link != NULL, -1);
 
-  return (CORBA_long) atk_hyperlink_get_end_index (link);
+  return atk_hyperlink_get_end_index (link);
 }
 
 
@@ -154,7 +152,7 @@ impl_getURI (PortableServer_Servant servant,
 
   g_return_val_if_fail (link != NULL, CORBA_string_dup (""));
 
-  uri = atk_hyperlink_get_uri (link, (gint) i);
+  uri = atk_hyperlink_get_uri (link, i);
   if (uri)
     {
       rv = CORBA_string_dup (uri);
@@ -177,7 +175,7 @@ impl_getObject (PortableServer_Servant servant,
 
   g_return_val_if_fail (link != NULL, CORBA_OBJECT_NIL);
 
-  atk_object = atk_hyperlink_get_object (link, (gint) i);
+  atk_object = atk_hyperlink_get_object (link, i);
 
   return spi_accessible_new_return (atk_object, FALSE, ev);
 }
@@ -191,6 +189,6 @@ impl_isValid (PortableServer_Servant servant,
 
   g_return_val_if_fail (link != NULL, TRUE);
 
-  return (CORBA_boolean) atk_hyperlink_is_valid (link);
+  return atk_hyperlink_is_valid (link);
 }