X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Fhyperlink.c;h=a858742c8fff99c24d851891de8e2b79404b6ce8;hb=66c4375c7cd9a0a01e79f562e1bb0326fc4dcd21;hp=2d55b8b80020e7687efdb55ed026d0864167c875;hpb=e07aeb10fff4c7802393f5cbe8460d1097cbec18;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c
index 2d55b8b..a858742 100644
--- a/libspi/hyperlink.c
+++ b/libspi/hyperlink.c
@@ -44,11 +44,11 @@
  */
 
 static void
-hyperlink_class_init (HyperlinkClass *klass);
+spi_hyperlink_class_init (SpiHyperlinkClass *klass);
 static void
-hyperlink_init (Hyperlink *hyperlink);
+spi_hyperlink_init (SpiHyperlink *hyperlink);
 static void
-hyperlink_finalize (GObject *obj);
+spi_hyperlink_finalize (GObject *obj);
 static CORBA_string
 impl_getURI (PortableServer_Servant _servant,
 	     const CORBA_long i, CORBA_Environment * ev);
@@ -72,21 +72,21 @@ impl_isValid (PortableServer_Servant _servant,
 static GObjectClass *parent_class;
 
 GType
-hyperlink_get_type (void)
+spi_hyperlink_get_type (void)
 {
   static GType type = 0;
 
   if (!type) {
     static const GTypeInfo tinfo = {
-      sizeof (HyperlinkClass),
+      sizeof (SpiHyperlinkClass),
       (GBaseInitFunc) NULL,
       (GBaseFinalizeFunc) NULL,
-      (GClassInitFunc) hyperlink_class_init,
+      (GClassInitFunc) spi_hyperlink_class_init,
       (GClassFinalizeFunc) NULL,
       NULL, /* class data */
-      sizeof (Hyperlink),
+      sizeof (SpiHyperlink),
       0, /* n preallocs */
-      (GInstanceInitFunc) hyperlink_init,
+      (GInstanceInitFunc) spi_hyperlink_init,
                         NULL /* value table */
     };
 
@@ -99,26 +99,26 @@ hyperlink_get_type (void)
 			       BONOBO_OBJECT_TYPE,
 			       POA_Accessibility_Hyperlink__init,
 			       NULL,
-			       G_STRUCT_OFFSET (HyperlinkClass, epv),
+			       G_STRUCT_OFFSET (SpiHyperlinkClass, epv),
 			       &tinfo,
-			       "AccessibleHyperlink");
+			       "SpiAccessibleHyperlink");
   }
 
   return type;
 }
 
 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;
+  object_class->finalize = spi_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;
@@ -127,24 +127,26 @@ hyperlink_class_init (HyperlinkClass *klass)
 }
 
 static void
-hyperlink_init (Hyperlink *hyperlink)
+spi_hyperlink_init (SpiHyperlink *hyperlink)
 {
 }
 
 static void
-hyperlink_finalize (GObject *obj)
+spi_hyperlink_finalize (GObject *obj)
 {
-  Hyperlink *hyperlink = HYPERLINK(obj);
-  hyperlink->atk_hyperlink = NULL;
+  SpiHyperlink *hyperlink = SPI_HYPERLINK(obj);
+  g_object_unref (hyperlink->atko);
+  hyperlink->atko = NULL;
   parent_class->finalize (obj);
 }
 
-Hyperlink *
-hyperlink_new (AtkHyperlink *hyperlink)
+SpiHyperlink *
+spi_hyperlink_interface_new (AtkObject *obj)
 {
-  Hyperlink *new_hyperlink = 
-    HYPERLINK(g_object_new (HYPERLINK_TYPE, NULL));
-  new_hyperlink->atk_hyperlink = hyperlink;
+  SpiHyperlink *new_hyperlink = 
+    SPI_HYPERLINK(g_object_new (SPI_HYPERLINK_TYPE, NULL));
+  new_hyperlink->atko = obj;
+  g_object_ref (obj);
   return new_hyperlink;
 }
 
@@ -154,8 +156,8 @@ static CORBA_short
 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 (link->atk_hyperlink);
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
+  return (CORBA_short) atk_hyperlink_get_n_anchors (ATK_HYPERLINK(link->atko));
 }
 
 
@@ -164,8 +166,8 @@ static CORBA_long
 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 (link->atk_hyperlink);
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
+  return (CORBA_long) atk_hyperlink_get_start_index (ATK_HYPERLINK(link->atko));
 }
 
 
@@ -174,8 +176,8 @@ static CORBA_long
 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 (link->atk_hyperlink);
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
+  return (CORBA_long) atk_hyperlink_get_end_index (ATK_HYPERLINK(link->atko));
 }
 
 
@@ -184,12 +186,17 @@ static CORBA_string
 impl_getURI (PortableServer_Servant _servant,
   const CORBA_long i, CORBA_Environment * ev)
 {
-  Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
   gchar *uri;
   CORBA_char *rv;
-  uri = atk_hyperlink_get_uri (link->atk_hyperlink, (gint) i);
-  rv = CORBA_string_dup (uri);
-  g_free (uri);
+  uri = atk_hyperlink_get_uri (ATK_HYPERLINK(link->atko), (gint) i);
+  if (uri)
+    {
+      rv = CORBA_string_dup (uri);
+      g_free (uri);
+      }
+  else
+    rv = CORBA_string_dup ("");
   return rv;
 } 
 
@@ -200,11 +207,11 @@ impl_getObject (PortableServer_Servant _servant,
 		const CORBA_long i,
 		CORBA_Environment * ev)
 {
-  Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
   AtkObject *atk_object;
   Accessibility_Accessible rv;
-  atk_object = atk_hyperlink_get_object (link->atk_hyperlink, (gint) i);
-  rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(atk_object)));
+  atk_object = atk_hyperlink_get_object (ATK_HYPERLINK(link->atko), (gint) i);
+  rv = bonobo_object_corba_objref (BONOBO_OBJECT(spi_accessible_new(atk_object)));
   return rv;
 }
 
@@ -214,8 +221,8 @@ static CORBA_boolean
 impl_isValid (PortableServer_Servant _servant,
 	      CORBA_Environment * ev)
 {
-  Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
-  return (CORBA_boolean) atk_hyperlink_is_valid (link->atk_hyperlink);
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
+  return (CORBA_boolean) atk_hyperlink_is_valid (ATK_HYPERLINK(link->atko));
 }