Revert "Revert "Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_1...

[platform/upstream/atk.git] / atk / atkimage.c

diff --git a/atk/atkimage.c b/atk/atkimage.c
old mode 100644 (file)
new mode 100755 (executable)
index 53ae628..2ba5909
--- a/atk/atkimage.c
+++ b/atk/atkimage.c
@@ -12,9 +12,13 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * 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 "config.h"
+
 #include "atkimage.h"
 
 /**
@@ -206,11 +210,11 @@ atk_image_get_image_position (AtkImage *image,
  * atk_image_get_image_locale: 
  * @image: An #AtkImage
  *
- * Since ATK 1.12
+ * Since: 1.12
  *
- * Returns: a string corresponding to the POSIX LC_MESSAGES locale
- * used by the image description, or NULL if the image does not
- * specify a locale.
+ * Returns: (nullable): a string corresponding to the POSIX
+ * LC_MESSAGES locale used by the image description, or %NULL if the
+ * image does not specify a locale.
  *
  */
 const gchar*