projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2008-07-21 Mark Doffman <mark.doffman@codethink.co.uk>
[platform/core/uifw/at-spi2-atk.git]
/
cspi
/
spi_hypertext.c
diff --git
a/cspi/spi_hypertext.c
b/cspi/spi_hypertext.c
index
0490b22
..
e6f7a7b
100644
(file)
--- a/
cspi/spi_hypertext.c
+++ b/
cspi/spi_hypertext.c
@@
-2,7
+2,8
@@
* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
* 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
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@
-66,12
+67,11
@@
AccessibleHypertext_unref (AccessibleHypertext *obj)
long
AccessibleHypertext_getNLinks (AccessibleHypertext *obj)
{
long
AccessibleHypertext_getNLinks (AccessibleHypertext *obj)
{
-
long
retval;
+
dbus_int32_t
retval;
cspi_return_val_if_fail (obj != NULL, FALSE);
cspi_return_val_if_fail (obj != NULL, FALSE);
- retval =
- Accessibility_Hypertext_getNLinks (CSPI_OBJREF (obj), cspi_ev ());
+ cspi_dbus_call (obj, spi_interface_hypertext, "getNLinks", NULL, "=>i", &retval);
cspi_return_val_if_ev ("getNLinks", -1);
cspi_return_val_if_ev ("getNLinks", -1);
@@
-91,17
+91,19
@@
AccessibleHyperlink *
AccessibleHypertext_getLink (AccessibleHypertext *obj,
long int linkIndex)
{
AccessibleHypertext_getLink (AccessibleHypertext *obj,
long int linkIndex)
{
+ dbus_int32_t d_linkIndex = linkIndex;
+ char *path;
AccessibleHyperlink *retval;
AccessibleHyperlink *retval;
- cspi_return_val_if_fail (obj != NULL, FALSE);
+ cspi_return_val_if_fail (obj != NULL, NULL);
+
+ cspi_dbus_call (obj, spi_interface_hypertext, "getLink", NULL, "i=>o", d_linkIndex, &path);
- retval = cspi_object_add (
- Accessibility_Hypertext_getLink (CSPI_OBJREF (obj),
- (CORBA_long) linkIndex,
- cspi_ev ()));
-
cspi_return_val_if_ev ("getLink", NULL);
cspi_return_val_if_ev ("getLink", NULL);
+ retval = cspi_ref_related_accessible (obj, path);
+ g_free (path);
+
return retval;
}
return retval;
}
@@
-121,14
+123,12
@@
long
AccessibleHypertext_getLinkIndex (AccessibleHypertext *obj,
long int characterOffset)
{
AccessibleHypertext_getLinkIndex (AccessibleHypertext *obj,
long int characterOffset)
{
- long retval;
+ dbus_int32_t d_characterOffset = characterOffset;
+ dbus_int32_t retval;
cspi_return_val_if_fail (obj != NULL, -1);
cspi_return_val_if_fail (obj != NULL, -1);
- retval =
- Accessibility_Hypertext_getLinkIndex (CSPI_OBJREF (obj),
- (CORBA_long) characterOffset,
- cspi_ev ());
+ cspi_dbus_call (obj, spi_interface_hypertext, "getLinkIndex", NULL, "i=>i", d_characterOffset, &retval);
cspi_return_val_if_ev ("getLinkIndex", -1);
cspi_return_val_if_ev ("getLinkIndex", -1);