X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cspi%2Fspi_hypertext.c;h=e6f7a7b013478e4785f38f526e91453e2f92cb41;hb=4946775a4aa19df13d8950f0c5e0fb438546bc84;hp=d5ea317100f7927796470cf2e5d4b15f0d968ef5;hpb=8e873a6ebbed811c4f41cbdddf6e6ba23d6bce0a;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/cspi/spi_hypertext.c b/cspi/spi_hypertext.c
index d5ea317..e6f7a7b 100644
--- a/cspi/spi_hypertext.c
+++ b/cspi/spi_hypertext.c
@@ -1,3 +1,26 @@
+/*
+ * AT-SPI - Assistive Technology Service Provider Interface
+ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
+ *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #include <cspi/spi-private.h>
 
 /**
@@ -7,18 +30,13 @@
  * Increment the reference count for an #AccessibleHypertext object.
  *       Since AccessibleHypertext is derived from AccessibleText,
  *       this is the same as AccessibleText_unref().
- *
- * Returns: (no return code implemented yet).
- *
  **/
-int
+void
 AccessibleHypertext_ref (AccessibleHypertext *obj)
 {
-  Accessibility_Hypertext_ref (*obj, spi_ev ());
-  return 0;
+  cspi_object_ref (obj);
 }
 
-
 /**
  * AccessibleHypertext_unref:
  * @obj: a pointer to the #AccessibleHypertext object on which to operate.
@@ -26,19 +44,13 @@ AccessibleHypertext_ref (AccessibleHypertext *obj)
  * Decrement the reference count for an #AccessibleHypertext object.
  *       Since AccessibleHypertext is derived from AccessibleText,
  *       this is the same as AccessibleText_unref().
- *
- * Returns: (no return code implemented yet).
- *
  **/
-int
+void
 AccessibleHypertext_unref (AccessibleHypertext *obj)
 {
-  Accessibility_Hypertext_unref (*obj, spi_ev ());
-  return 0;
+  cspi_object_unref (obj);
 }
 
-
-
 /**
  * AccessibleHypertext_getNLinks:
  * @obj: a pointer to the #AccessibleHypertext implementor on which to operate.
@@ -51,15 +63,20 @@ AccessibleHypertext_unref (AccessibleHypertext *obj)
  *        the number cannot be determined (for example, if the
  *        #AccessibleHypertext object is so large that it is not
  *        all currently in the memory cache).
- *
  **/
 long
 AccessibleHypertext_getNLinks (AccessibleHypertext *obj)
 {
-  return (long)
-    Accessibility_Hypertext_getNLinks (*obj, spi_ev ());
-}
+  dbus_int32_t retval;
 
+  cspi_return_val_if_fail (obj != NULL, FALSE);
+
+  cspi_dbus_call (obj, spi_interface_hypertext, "getNLinks", NULL, "=>i", &retval);
+
+  cspi_return_val_if_ev ("getNLinks", -1);
+
+  return retval;
+}
 
 /**
  * AccessibleHypertext_getLink:
@@ -69,17 +86,26 @@ AccessibleHypertext_getNLinks (AccessibleHypertext *obj)
  * Get the #AccessibleHyperlink object at a specified index.
  *
  * Returns: the #AccessibleHyperlink object specified by #linkIndex.
- *
  **/
 AccessibleHyperlink *
 AccessibleHypertext_getLink (AccessibleHypertext *obj,
-                             long int linkIndex)
+                             long int             linkIndex)
 {
-  return (AccessibleHyperlink *)
-    Accessibility_Hypertext_getLink (*obj,
-				     (CORBA_long) linkIndex, spi_ev ());
-}
+  dbus_int32_t d_linkIndex = linkIndex;
+  char *path;
+  AccessibleHyperlink *retval;
+	
+  cspi_return_val_if_fail (obj != NULL, NULL);
+
+  cspi_dbus_call (obj, spi_interface_hypertext, "getLink", NULL, "i=>o", d_linkIndex, &path);
 
+  cspi_return_val_if_ev ("getLink", NULL); 
+
+  retval = cspi_ref_related_accessible (obj, path);
+  g_free (path);
+  
+  return retval;
+}
 
 /**
  * AccessibleHypertext_getLinkIndex:
@@ -92,15 +118,21 @@ AccessibleHypertext_getLink (AccessibleHypertext *obj,
  * Returns: the linkIndex of the #AccessibleHyperlink active at
  *        character offset @characterOffset, or -1 if there is
  *        no hyperlink at the specified character offset.
- *
  **/
 long
 AccessibleHypertext_getLinkIndex (AccessibleHypertext *obj,
-                                  long int characterOffset)
+                                  long int             characterOffset)
 {
-  return (long)
-    Accessibility_Hypertext_getLinkIndex (*obj,
-					  (CORBA_long) characterOffset, spi_ev ());
+  dbus_int32_t d_characterOffset = characterOffset;
+  dbus_int32_t retval;
+
+  cspi_return_val_if_fail (obj != NULL, -1);
+
+  cspi_dbus_call (obj, spi_interface_hypertext, "getLinkIndex", NULL, "i=>i", d_characterOffset, &retval);
+
+  cspi_return_val_if_ev ("getLinkIndex", -1);
+
+  return retval;
 }