X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atspi%2Fatspi-hyperlink.c;h=80f8a54ad95ccfb6e652fb4a35799132d4bff7b7;hb=23eef2559fe0e0e625cba7a47c07516fae05e23c;hp=57c4b81552e2aa5996e77cffc4cd9a7622ca230a;hpb=7cc0c0127ac83356ca9f26e2eb1a20f209a13119;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/atspi/atspi-hyperlink.c b/atspi/atspi-hyperlink.c
index 57c4b81..80f8a54 100644
--- a/atspi/atspi-hyperlink.c
+++ b/atspi/atspi-hyperlink.c
@@ -37,13 +37,11 @@ atspi_hyperlink_class_init (AtspiHyperlinkClass *klass)
 }
 
 AtspiHyperlink *
-atspi_hyperlink_new (AtspiApplication *app, const gchar *path)
+_atspi_hyperlink_new (AtspiApplication *app, const gchar *path)
 {
   AtspiHyperlink *hyperlink;
   
   hyperlink = g_object_new (ATSPI_TYPE_HYPERLINK, NULL);
-  g_return_val_if_fail (hyperlink != NULL, NULL);
-
   hyperlink->parent.app = g_object_ref (app);
   hyperlink->parent.path = g_strdup (path);
 
@@ -54,11 +52,12 @@ atspi_hyperlink_new (AtspiApplication *app, const gchar *path)
  * atspi_hyperlink_get_n_anchors:
  * @obj: a pointer to the #AtspiHyperlink object on which to operate.
  *
- * Get the total number of anchors which an #AtspiHyperlink implementor has.
- *       Though typical hyperlinks have only one anchor, client-side image maps and
- *       other hypertext objects may potentially activate or refer to multiple
- *       URIs.  For each anchor there is a corresponding URI and object.
- * see atspi_hyperlink_get_uri() and atspi_hyperlink_get_object().
+ * Gets the total number of anchors which an #AtspiHyperlink implementor has.
+ * Though typical hyperlinks have only one anchor, client-side image maps and
+ * other hypertext objects may potentially activate or refer to multiple
+ * URIs.  For each anchor there is a corresponding URI and object.
+ *
+ * see: #atspi_hyperlink_get_uri and #atspi_hyperlink_get_object.
  *
  * Returns: a #gint indicating the number of anchors in this hyperlink.
  **/
@@ -79,7 +78,7 @@ atspi_hyperlink_get_n_anchors (AtspiHyperlink *obj, GError **error)
  * @obj: a pointer to the #AtspiHyperlink implementor on which to operate.
  * @i: a (zero-index) integer indicating which hyperlink anchor to query.
  *
- * Get the URI associated with a particular hyperlink anchor.  
+ * Gets the URI associated with a particular hyperlink anchor.
  *
  * Returns: a UTF-8 string giving the URI of the @ith hyperlink anchor.
  **/
@@ -102,9 +101,10 @@ atspi_hyperlink_get_uri (AtspiHyperlink *obj, int i, GError **error)
 /**
  * atspi_hyperlink_get_object:
  * @obj: a pointer to the #AtspiHyperlink implementor on which to operate.
- * @i: a (zero-index) long integer indicating which hyperlink anchor to query.
+ * @i: a (zero-index) #gint indicating which hyperlink anchor to query.
  *
- * Get the object associated with a particular hyperlink anchor, as an #Accessible. 
+ * Gets the object associated with a particular hyperlink anchor, as an
+ * #AtspiAccessible.
  *
  * Returns: (transfer full): an #AtspiAccessible that represents the object
  *        associated with the @ith anchor of the specified #AtspiHyperlink.
@@ -127,19 +127,19 @@ atspi_hyperlink_get_object (AtspiHyperlink *obj, gint i, GError **error)
  * @obj: a pointer to the #AtspiHyperlink implementor on which to operate.
  *
  *
- * Get the starting and ending character offsets of the text range associated with
- *       a #AtspiHyperlink, in its originating #AtspiHypertext.
+ * Gets the starting and ending character offsets of the text range
+ * associated with an #AtspiHyperlink, in its originating #AtspiHypertext.
  **/
 AtspiRange *
 atspi_hyperlink_get_index_range (AtspiHyperlink *obj, GError **error)
 {
-  dbus_int32_t d_start_offset, d_end_offset;
+  dbus_int32_t d_start_offset = -1;
+  dbus_int32_t d_end_offset = -1;
   AtspiRange *ret = g_new (AtspiRange, 1);
 
-  if (ret)
-    ret->start_offset = ret->end_offset = -1;
+  ret->start_offset = ret->end_offset = -1;
 
-  if (!obj || !ret)
+  if (!obj)
     return ret;
 
   _atspi_dbus_call (obj, atspi_interface_hyperlink, "GetIndexRange", error, "=>ii", &d_start_offset, &d_end_offset);
@@ -154,8 +154,8 @@ atspi_hyperlink_get_index_range (AtspiHyperlink *obj, GError **error)
  * @obj: a pointer to the #AtspiHyperlink implementor on which to operate.
  *
  *
- * Get the starting character offset of the text range associated with
- *       a #AtspiHyperlink, in its originating #AtspiHypertext.
+ * Gets the starting character offset of the text range associated with
+ *       an #AtspiHyperlink, in its originating #AtspiHypertext.
  **/
 gint
 atspi_hyperlink_get_start_index (AtspiHyperlink *obj, GError **error)
@@ -175,8 +175,8 @@ atspi_hyperlink_get_start_index (AtspiHyperlink *obj, GError **error)
  * @obj: a pointer to the #AtspiHyperlink implementor on which to operate.
  *
  *
- * Get the ending character offset of the text range associated with
- *       a #AtspiHyperlink, in its originating #AtspiHypertext.
+ * Gets the ending character offset of the text range associated with
+ *       an #AtspiHyperlink, in its originating #AtspiHypertext.
  **/
 gint
 atspi_hyperlink_get_end_index (AtspiHyperlink *obj, GError **error)
@@ -197,10 +197,10 @@ atspi_hyperlink_get_end_index (AtspiHyperlink *obj, GError **error)
  * atspi_hyperlink_is_valid:
  * @obj: a pointer to the #AtspiHyperlink on which to operate.
  *
- * Tell whether an #AtspiHyperlink object is still valid with respect to its
+ * Tells whether an #AtspiHyperlink object is still valid with respect to its
  *          originating hypertext object.
  *
- * Returns: #TRUE of the specified #AtspiHyperlink is still valid with respect
+ * Returns: #TRUE if the specified #AtspiHyperlink is still valid with respect
  *          to its originating #AtspiHypertext object, #FALSE otherwise.
  **/
 gboolean