Imported Upstream version 1.50.0

Change-Id: I575d4a4070fc55e27d5a10fdd3549b26621bbb5a
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/build/win32/vs10/gi-version-paths.props b/build/win32/vs10/gi-version-paths.props
index efcc748..7a13a77 100644 (file)
--- a/build/win32/vs10/gi-version-paths.props
+++ b/build/win32/vs10/gi-version-paths.props
@@ -10,7 +10,7 @@
     <PythonDirX64>$(PythonDir).x64</PythonDirX64>
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
     <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.49.2</GIVersion>
+    <GIVersion>1.50.0</GIVersion>
     <BASE_GI_DIR>$(SolutionDir)\..\..\..</BASE_GI_DIR>
     <ApiVersion>1.0</ApiVersion>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>

diff --git a/build/win32/vs9/gi-version-paths.vsprops b/build/win32/vs9/gi-version-paths.vsprops
index 4769bab..af45d27 100644 (file)
--- a/build/win32/vs9/gi-version-paths.vsprops
+++ b/build/win32/vs9/gi-version-paths.vsprops
@@ -36,7 +36,7 @@
        />
        <UserMacro
                Name="GIVersion"
-               Value="1.49.2"
+               Value="1.50.0"
        />
        <UserMacro
                Name="BASE_GI_DIR"

diff --git a/config.h.win32 b/config.h.win32
index 1282a8c..a05be25 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -96,7 +96,7 @@
 #define PACKAGE_NAME "gobject-introspection"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gojbect-introspection 1.49.2"
+#define PACKAGE_STRING "gojbect-introspection 1.50.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gobject-introspection"
@@ -105,7 +105,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.49.2"
+#define PACKAGE_VERSION "1.50.0"
 
 /* Define to the platform's shared library suffix */
 #define SHLIB_SUFFIX ".dll"
@@ -126,7 +126,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.49.2"
+#define VERSION "1.50.0"
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */

diff --git a/configure b/configure
index 298b386..fbfa24f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gobject-introspection 1.49.2.
+# Generated by GNU Autoconf 2.69 for gobject-introspection 1.50.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gobject-introspection'
 PACKAGE_TARNAME='gobject-introspection'
-PACKAGE_VERSION='1.49.2'
-PACKAGE_STRING='gobject-introspection 1.49.2'
+PACKAGE_VERSION='1.50.0'
+PACKAGE_STRING='gobject-introspection 1.50.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection'
 PACKAGE_URL=''
 
@@ -1434,7 +1434,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gobject-introspection 1.49.2 to adapt to many kinds of systems.
+\`configure' configures gobject-introspection 1.50.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1505,7 +1505,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gobject-introspection 1.49.2:";;
+     short | recursive ) echo "Configuration of gobject-introspection 1.50.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1667,7 +1667,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gobject-introspection configure 1.49.2
+gobject-introspection configure 1.50.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2219,7 +2219,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gobject-introspection $as_me 1.49.2, which was
+It was created by gobject-introspection $as_me 1.50.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3087,7 +3087,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gobject-introspection'
- VERSION='1.49.2'
+ VERSION='1.50.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3361,7 +3361,7 @@ AM_BACKSLASH='\'
 
 
 # Used in docs/reference/version.xml
-GI_VERSION=1.49.2
+GI_VERSION=1.50.0
 
 
 # Check for Win32
@@ -13131,12 +13131,12 @@ if test -n "$GLIB_CFLAGS"; then
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.49.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.49.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.50.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.50.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.49.7" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.50.0" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13148,12 +13148,12 @@ if test -n "$GLIB_LIBS"; then
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.49.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.49.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.50.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.50.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.49.7" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.50.0" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13174,14 +13174,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.49.7" 2>&1`
+               GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.50.0" 2>&1`
         else
-               GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.49.7" 2>&1`
+               GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.50.0" 2>&1`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GLIB_PKG_ERRORS" >&5
 
-       as_fn_error $? "Package requirements (glib-2.0 >= 2.49.7) were not met:
+       as_fn_error $? "Package requirements (glib-2.0 >= 2.50.0) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -16021,7 +16021,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gobject-introspection $as_me 1.49.2, which was
+This file was extended by gobject-introspection $as_me 1.50.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16087,7 +16087,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gobject-introspection config.status 1.49.2
+gobject-introspection config.status 1.50.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 138a799..9d5c7bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 49)
-m4_define(gi_micro_version, 2)
+m4_define(gi_minor_version, 50)
+m4_define(gi_micro_version, 0)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
@@ -128,7 +128,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
 AC_SUBST(GIR_DIR)
 AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.49.7])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.50.0])
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
 PKG_CHECK_MODULES(GIO, [gio-2.0])

diff --git a/docs/reference/html/annotation-glossary.html b/docs/reference/html/annotation-glossary.html
index d812b79..66dbb15 100644 (file)
--- a/docs/reference/html/annotation-glossary.html
+++ b/docs/reference/html/annotation-glossary.html
@@ -16,6 +16,8 @@
                      <span class="dim">|</span> 
                   <a class="shortcut" href="#glsE">E</a>
                      <span class="dim">|</span> 
+                  <a class="shortcut" href="#glsI">I</a>
+                     <span class="dim">|</span> 
                   <a class="shortcut" href="#glsN">N</a>
                      <span class="dim">|</span> 
                   <a class="shortcut" href="#glsO">O</a>
@@ -37,6 +39,9 @@
 <a name="glsE"></a><h3 class="title">E</h3>
 <dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
 <dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
+<a name="glsI"></a><h3 class="title">I</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-inout"></a>inout</span></dt>
+<dd class="glossdef"><p>Parameter for input and for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
 <a name="glsN"></a><h3 class="title">N</h3>
 <dt><span class="glossterm"><a name="annotation-glossterm-nullable"></a>nullable</span></dt>
 <dd class="glossdef"><p>NULL may be passed as the value in, out, in-out; or as a return value.</p></dd>

diff --git a/docs/reference/html/gi-GIBaseInfo.html b/docs/reference/html/gi-GIBaseInfo.html
index 7a3af5c..dda961f 100644 (file)
--- a/docs/reference/html/gi-GIBaseInfo.html
+++ b/docs/reference/html/gi-GIBaseInfo.html
@@ -566,8 +566,8 @@ and must not be freed.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>iterator</p></td>
-<td class="parameter_description"><p>a <a class="link" href="gi-GIBaseInfo.html#GIAttributeIter" title="GIAttributeIter"><span class="type">GIAttributeIter</span></a> structure, must be initialized; see below</p></td>
-<td class="parameter_annotations"> </td>
+<td class="parameter_description"><p> a <a class="link" href="gi-GIBaseInfo.html#GIAttributeIter" title="GIAttributeIter"><span class="type">GIAttributeIter</span></a> structure, must be initialized; see below. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>name</p></td>

diff --git a/docs/reference/html/gi-GICallableInfo.html b/docs/reference/html/gi-GICallableInfo.html
index a41b57f..0957f38 100644 (file)
--- a/docs/reference/html/gi-GICallableInfo.html
+++ b/docs/reference/html/gi-GICallableInfo.html
@@ -530,8 +530,8 @@ similar API.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>iterator</p></td>
-<td class="parameter_description"><p>a <a class="link" href="gi-GIBaseInfo.html#GIAttributeIter" title="GIAttributeIter"><span class="type">GIAttributeIter</span></a> structure, must be initialized; see below</p></td>
-<td class="parameter_annotations"> </td>
+<td class="parameter_description"><p> a <a class="link" href="gi-GIBaseInfo.html#GIAttributeIter" title="GIAttributeIter"><span class="type">GIAttributeIter</span></a> structure, must be initialized; see below. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>name</p></td>

diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html
index e4338d0..5ca5df3 100644 (file)
--- a/docs/reference/html/index.html
+++ b/docs/reference/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GObject Introspection Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      This document is for GObject Introspection version 1.49.2
+      This document is for GObject Introspection version 1.50.0
 .
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="http://developer.gnome.org/gi/unstable/" target="_top">http://developer.gnome.org/gi/unstable/</a>.

diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index 666633d..5a5c721 100644 (file)
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-1.49.2
+1.50.0

diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 639d0d8..9e0b51b 100644 (file)
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -19640,7 +19640,7 @@
 
 /**
  * g_log_variant:
- * @log_domain: log domain, usually %G_LOG_DOMAIN
+ * @log_domain: (allow-none): log domain, usually %G_LOG_DOMAIN
  * @log_level: log level, either from #GLogLevelFlags, or a user-defined
  *    level
  * @fields: a dictionary (#GVariant of the type %G_VARIANT_TYPE_VARDICT)

diff --git a/girepository/gibaseinfo.c b/girepository/gibaseinfo.c
index 5d9e5f3..ced7674 100644 (file)
--- a/girepository/gibaseinfo.c
+++ b/girepository/gibaseinfo.c
@@ -558,7 +558,7 @@ _attribute_blob_find_first (GIBaseInfo *info,
 /**
  * g_base_info_iterate_attributes:
  * @info: a #GIBaseInfo
- * @iterator: a #GIAttributeIter structure, must be initialized; see below
+ * @iterator: (inout): a #GIAttributeIter structure, must be initialized; see below
  * @name: (out) (transfer none): Returned name, must not be freed
  * @value: (out) (transfer none): Returned name, must not be freed
  *

diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c
index 27c7cb2..4ffb46d 100644 (file)
--- a/girepository/gicallableinfo.c
+++ b/girepository/gicallableinfo.c
@@ -424,7 +424,7 @@ g_callable_info_get_return_attribute (GICallableInfo  *info,
 /**
  * g_callable_info_iterate_return_attributes:
  * @info: a #GICallableInfo
- * @iterator: a #GIAttributeIter structure, must be initialized; see below
+ * @iterator: (inout): a #GIAttributeIter structure, must be initialized; see below
  * @name: (out) (transfer none): Returned name, must not be freed
  * @value: (out) (transfer none): Returned name, must not be freed
  *

diff --git a/gobject-introspection-1.0.pc b/gobject-introspection-1.0.pc
index 1a3030f..26ff5f6 100644 (file)
--- a/gobject-introspection-1.0.pc
+++ b/gobject-introspection-1.0.pc
@@ -21,4 +21,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.49.2
+Version: 1.50.0

diff --git a/gobject-introspection-no-export-1.0.pc b/gobject-introspection-no-export-1.0.pc
index 3144f19..c4569e4 100644 (file)
--- a/gobject-introspection-no-export-1.0.pc
+++ b/gobject-introspection-no-export-1.0.pc
@@ -20,4 +20,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.49.2
+Version: 1.50.0