Imported Upstream version 2.48.0

diff --git a/configure.ac b/configure.ac
index 12af831..52a001e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## 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/>.
 
-AC_INIT([glibmm], [2.47.92],
+AC_INIT([glibmm], [2.48.0],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
         [glibmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -62,7 +62,7 @@ AS_IF([test "x$enable_static" = xyes],
   AC_DEFINE([GIOMM_STATIC_LIB],  [1], [Define if giomm is built as a static library])
 ])
 
-glibreq='2.0 >= 2.47.92'
+glibreq='2.0 >= 2.48.0'
 
 GLIBMM_MODULES="sigc++-2.0 >= 2.8.0 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
 GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"

diff --git a/gio/src/gio_docs.xml b/gio/src/gio_docs.xml
index b7bad57..a575ef9 100644 (file)
--- a/gio/src/gio_docs.xml
+++ b/gio/src/gio_docs.xml
@@ -7263,7 +7263,7 @@ Since: 2.28
 </parameter>
 </parameters>
 <return> a %NULL-terminated array of the names of the
-actions in the groupb
+actions in the group
 
 </return>
 </function>

diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs
index 5f40b2a..7af937c 100644 (file)
--- a/gio/src/gio_signals.defs
+++ b/gio/src/gio_signals.defs
@@ -197,6 +197,7 @@
   (readable #f)
   (writable #t)
   (construct-only #f)
+  (deprecated #t)
 )
 
 (define-property is-busy
@@ -1068,6 +1069,7 @@
   (readable #t)
   (writable #t)
   (construct-only #t)
+  (deprecated #t)
 )
 
 (define-property schema-id
@@ -1770,6 +1772,7 @@
   (readable #t)
   (writable #t)
   (construct-only #t)
+  (deprecated #t)
 )
 
 (define-property schema-id

diff --git a/glib/src/glib_docs.xml b/glib/src/glib_docs.xml
index b785ad3..3692d2d 100644 (file)
--- a/glib/src/glib_docs.xml
+++ b/glib/src/glib_docs.xml
@@ -899,7 +899,8 @@ This level is also used for messages produced by g_assert().
 </parameter_description>
 </parameter>
 <parameter name="G_LOG_LEVEL_CRITICAL">
-<parameter_description> log level for critical messages, see g_critical().
+<parameter_description> log level for critical warning messages, see
+g_critical().
 This level is also used for messages produced by g_return_if_fail()
 and g_return_val_if_fail().
 </parameter_description>
@@ -11934,7 +11935,7 @@ Since: 2.8
 
 <function name="g_clear_error">
 <description>
-If @err is %NULL, does nothing. If @err is non-%NULL,
+If @err or *@err is %NULL, does nothing. Otherwise,
 calls g_error_free() on *@err and sets *@err to %NULL.
 
 </description>
@@ -18560,8 +18561,8 @@ in the
 [XDG Base Directory Specification](http://www.freedesktop.org/Standards/basedir-spec).
 This is the directory
 specified in the `XDG_RUNTIME_DIR` environment variable.
-In the case that this variable is not set, GLib will issue a warning
-message to stderr and return the value of g_get_user_cache_dir().
+In the case that this variable is not set, we return the value of
+g_get_user_cache_dir(), after verifying that it exists.
 
 On Windows this is the folder to use for local (as opposed to
 roaming) application data. See documentation for