Fixed macro-name typos.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@161 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index caded9d..c649c47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-12-10  Bill Haneman  <bill.haneman@sun.com>
 
+       * cspi/spi_hyperlink.c:
+       * cspi/spi_hypertext.c:
+       Fixed macro name typos, and remove use of obsolete macro in 
+       AccessibleHyperlink_getLink.
+
        * cspi/spi_action.c:
        * cspi/spi_accessible.c:
        * cspi/spi_application.c:

diff --git a/cspi/spi_hyperlink.c b/cspi/spi_hyperlink.c
index d9f03d9..89bb776 100644 (file)
--- a/cspi/spi_hyperlink.c
+++ b/cspi/spi_hyperlink.c
@@ -46,7 +46,7 @@ AccessibleHyperlink_getNAnchors (AccessibleHyperlink *obj)
   retval =
     Accessibility_Hyperlink__get_nAnchors (CSPI_OBJREF (obj), cspi_ev ());
 
-  cspi_return_val_if_ex ("getNAnchors", -1);
+  cspi_return_val_if_ev ("getNAnchors", -1);
 
   return retval;
 }
@@ -72,7 +72,7 @@ AccessibleHyperlink_getURI (AccessibleHyperlink *obj,
     Accessibility_Hyperlink_getURI (CSPI_OBJREF (obj),
                                    (CORBA_long) i, cspi_ev ());
 
-  cspi_return_val_if_ex ("getURI", NULL);
+  cspi_return_val_if_ev ("getURI", NULL);
 
   return retval;
 }
@@ -124,7 +124,7 @@ AccessibleHyperlink_getIndexRange (AccessibleHyperlink *obj,
   *endIndex = (long)
     Accessibility_Hyperlink__get_endIndex (CSPI_OBJREF (obj), cspi_ev ());
 
-  cspi_return_if_ex ("getIndexRange");
+  cspi_return_if_ev ("getIndexRange");
 }
 
 /**
@@ -147,7 +147,7 @@ AccessibleHyperlink_isValid (AccessibleHyperlink *obj)
   retval =
     Accessibility_Hyperlink_isValid (CSPI_OBJREF (obj), cspi_ev ());
 
-  cspi_return_val_if_ex ("isValid", FALSE);
+  cspi_return_val_if_ev ("isValid", FALSE);
 
   return retval;
 }

diff --git a/cspi/spi_hypertext.c b/cspi/spi_hypertext.c
index e9be198..7b0af7f 100644 (file)
--- a/cspi/spi_hypertext.c
+++ b/cspi/spi_hypertext.c
@@ -51,7 +51,7 @@ AccessibleHypertext_getNLinks (AccessibleHypertext *obj)
   retval =
     Accessibility_Hypertext_getNLinks (CSPI_OBJREF (obj), cspi_ev ());
 
-  cspi_return_val_if_ex ("getNLinks", -1);
+  cspi_return_val_if_ev ("getNLinks", -1);
 
   return retval;
 }
@@ -69,11 +69,18 @@ AccessibleHyperlink *
 AccessibleHypertext_getLink (AccessibleHypertext *obj,
                              long int             linkIndex)
 {
+  AccessibleHyperlink *retval;
+       
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  return cspi_object_new (
+  retval = cspi_object_add (
     Accessibility_Hypertext_getLink (CSPI_OBJREF (obj),
-                                    (CORBA_long) linkIndex, cspi_ev ()));
+                                    (CORBA_long) linkIndex,
+                                    cspi_ev ()));
+  
+  cspi_return_val_if_ev ("getLink", NULL); 
+
+  return retval;
 }
 
 /**
@@ -101,7 +108,7 @@ AccessibleHypertext_getLinkIndex (AccessibleHypertext *obj,
                                          (CORBA_long) characterOffset,
                                          cspi_ev ());
 
-  cspi_return_val_if_ex ("getLinkIndex", -1);
+  cspi_return_val_if_ev ("getLinkIndex", -1);
 
   return retval;
 }