Avoid crashing on null user_data

[platform/core/uifw/at-spi2-atk.git] / cspi / spi_image.c

diff --git a/cspi/spi_image.c b/cspi/spi_image.c
index 8349d8e..94d78ad 100644 (file)
--- a/cspi/spi_image.c
+++ b/cspi/spi_image.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>
 
 /**
@@ -45,7 +68,7 @@ AccessibleImage_getImageDescription (AccessibleImage *obj)
 
   cspi_return_val_if_ev ("getImageDescription", NULL);
 
-  return NULL;
+  return retval;
 }
 
 /**
@@ -142,7 +165,7 @@ AccessibleImage_getImageExtents (AccessibleImage *obj,
   cspi_return_if_fail (obj != NULL);
 
   bbox = Accessibility_Image_getImageExtents (CSPI_OBJREF (obj),
-                                             (CORBA_short) ctype,
+                                             ctype,
                                              cspi_ev ());
 
   if (!cspi_check_ev ("getImageExtents"))
@@ -157,3 +180,26 @@ AccessibleImage_getImageExtents (AccessibleImage *obj,
       *height = bbox.height;
     }
 }
+
+/**
+ * AccessibleImage_getImageLocale:
+ * @obj: The #AccessibleImage being queried.
+ *
+ * Get the locale associated with an image and its textual representation.
+ *
+ * Returns: A POSIX LC_MESSAGES-style Locale value for image description and text.
+ **/
+char *
+AccessibleImage_getImageLocale  (AccessibleImage *obj)
+{
+    char *retval = "C";
+
+    cspi_return_val_if_fail (obj != NULL, "C");
+
+    retval = Accessibility_Image__get_imageLocale (CSPI_OBJREF (obj), cspi_ev ());
+
+    cspi_return_val_if_ev ("getImageLocale", NULL);
+
+    return retval;
+}
+