* Boston, MA 02111-1307, USA.
*/
-/*
- * component.c : bonobo wrapper for accessible component implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* hyperlink.c : implements the Hyperlink interface */
+#include <config.h>
#include <stdio.h>
+#include <libspi/hyperlink.h>
+#include <libspi/accessible.h>
-/*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
- */
-#include <libspi/Accessibility.h>
+/* Static function declarations */
-/*
- * This pulls the definition of the hyperlink bonobo object
- */
-#include "hyperlink.h"
-
-/*
- * Static function declarations
- */
-
-static void
-hyperlink_class_init (HyperlinkClass *klass);
static void
-hyperlink_init (Hyperlink *hyperlink);
+spi_hyperlink_class_init (SpiHyperlinkClass *klass);
static void
-hyperlink_finalize (GObject *obj);
+spi_hyperlink_init (SpiHyperlink *hyperlink);
static CORBA_string
impl_getURI (PortableServer_Servant _servant,
const CORBA_long i, CORBA_Environment * ev);
impl_isValid (PortableServer_Servant _servant,
CORBA_Environment * ev);
-static GObjectClass *parent_class;
-GType
-hyperlink_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (HyperlinkClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) hyperlink_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (Hyperlink),
- 0, /* n preallocs */
- (GInstanceInitFunc) hyperlink_init,
- NULL /* value table */
- };
-
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- BONOBO_OBJECT_TYPE,
- POA_Accessibility_Hyperlink__init,
- NULL,
- G_STRUCT_OFFSET (HyperlinkClass, epv),
- &tinfo,
- "AccessibleHyperlink");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiHyperlink,
+ Accessibility_Hyperlink,
+ SPI_TYPE_BASE,
+ spi_hyperlink);
+
static void
-hyperlink_class_init (HyperlinkClass *klass)
+spi_hyperlink_class_init (SpiHyperlinkClass *klass)
{
- GObjectClass * object_class = (GObjectClass *) klass;
POA_Accessibility_Hyperlink__epv *epv = &klass->epv;
- parent_class = g_type_class_peek_parent (klass);
-
- object_class->finalize = hyperlink_finalize;
/* Initialize epv table */
- epv->_get_n_anchors = impl__get_n_anchors;
+ epv->_get_nAnchors = impl__get_n_anchors;
epv->getURI = impl_getURI;
epv->_get_startIndex = impl__get_startIndex;
epv->_get_endIndex = impl__get_endIndex;
epv->isValid = impl_isValid;
}
-static void
-hyperlink_init (Hyperlink *hyperlink)
-{
-}
static void
-hyperlink_finalize (GObject *obj)
+spi_hyperlink_init (SpiHyperlink *hyperlink)
{
- Hyperlink *hyperlink = HYPERLINK(obj);
- g_object_unref (hyperlink->atko);
- hyperlink->atko = NULL;
- parent_class->finalize (obj);
}
-Hyperlink *
-hyperlink_interface_new (AtkObject *obj)
+
+SpiHyperlink *
+spi_hyperlink_new (AtkObject *object)
{
- Hyperlink *new_hyperlink =
- HYPERLINK(g_object_new (HYPERLINK_TYPE, NULL));
- new_hyperlink->atko = obj;
- g_object_ref (obj);
+ SpiHyperlink *new_hyperlink = g_object_new (
+ SPI_HYPERLINK_TYPE, NULL);
+
+ spi_base_construct (SPI_BASE (new_hyperlink), object);
+
return new_hyperlink;
}
+static AtkHyperlink *
+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);
+}
+
static CORBA_short
-impl__get_n_anchors (PortableServer_Servant _servant,
- CORBA_Environment * ev)
+impl__get_n_anchors (PortableServer_Servant servant,
+ CORBA_Environment *ev)
{
- Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_short) atk_hyperlink_get_n_anchors (ATK_HYPERLINK(link->atko));
-}
+ AtkHyperlink *link = get_hyperlink_from_servant (servant);
+ g_return_val_if_fail (link != NULL, 0);
+
+ return (CORBA_short) atk_hyperlink_get_n_anchors (link);
+}
static CORBA_long
-impl__get_startIndex (PortableServer_Servant _servant,
- CORBA_Environment * ev)
+impl__get_startIndex (PortableServer_Servant servant,
+ CORBA_Environment *ev)
{
- Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_long) atk_hyperlink_get_start_index (ATK_HYPERLINK(link->atko));
-}
+ AtkHyperlink *link = get_hyperlink_from_servant (servant);
+
+ g_return_val_if_fail (link != NULL, -1);
+ return (CORBA_long) atk_hyperlink_get_start_index (link);
+}
static CORBA_long
-impl__get_endIndex (PortableServer_Servant _servant,
- CORBA_Environment * ev)
+impl__get_endIndex (PortableServer_Servant servant,
+ CORBA_Environment *ev)
{
- Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_long) atk_hyperlink_get_end_index (ATK_HYPERLINK(link->atko));
-}
+ AtkHyperlink *link = get_hyperlink_from_servant (servant);
+ g_return_val_if_fail (link != NULL, -1);
+
+ return (CORBA_long) atk_hyperlink_get_end_index (link);
+}
static CORBA_string
-impl_getURI (PortableServer_Servant _servant,
- const CORBA_long i, CORBA_Environment * ev)
+impl_getURI (PortableServer_Servant servant,
+ const CORBA_long i, CORBA_Environment *ev)
{
- Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
gchar *uri;
CORBA_char *rv;
- uri = atk_hyperlink_get_uri (ATK_HYPERLINK(link->atko), (gint) i);
- rv = CORBA_string_dup (uri);
- g_free (uri);
+ AtkHyperlink *link = get_hyperlink_from_servant (servant);
+
+ g_return_val_if_fail (link != NULL, CORBA_string_dup (""));
+
+ uri = atk_hyperlink_get_uri (link, (gint) i);
+ if (uri)
+ {
+ rv = CORBA_string_dup (uri);
+ g_free (uri);
+ }
+ else
+ rv = CORBA_string_dup ("");
+
return rv;
}
-
static Accessibility_Accessible
-impl_getObject (PortableServer_Servant _servant,
- const CORBA_long i,
- CORBA_Environment * ev)
+impl_getObject (PortableServer_Servant servant,
+ const CORBA_long i,
+ CORBA_Environment *ev)
{
- Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
- AtkObject *atk_object;
- Accessibility_Accessible rv;
- atk_object = atk_hyperlink_get_object (ATK_HYPERLINK(link->atko), (gint) i);
- rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(atk_object)));
- return rv;
-}
+ AtkObject *atk_object;
+ AtkHyperlink *link = get_hyperlink_from_servant (servant);
+ g_return_val_if_fail (link != NULL, CORBA_OBJECT_NIL);
+
+ atk_object = atk_hyperlink_get_object (link, (gint) i);
+
+ return spi_accessible_new_return (atk_object, FALSE, ev);
+}
static CORBA_boolean
-impl_isValid (PortableServer_Servant _servant,
- CORBA_Environment * ev)
+impl_isValid (PortableServer_Servant servant,
+ CORBA_Environment *ev)
{
- Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_boolean) atk_hyperlink_is_valid (ATK_HYPERLINK(link->atko));
-}
+ AtkHyperlink *link = get_hyperlink_from_servant (servant);
+
+ g_return_val_if_fail (link != NULL, TRUE);
+ return (CORBA_boolean) atk_hyperlink_is_valid (link);
+}
projects / platform / core / uifw / at-spi2-atk.git / blobdiff