[glibmm] 2.25.5 changes from glibmm-2-26 branch.

[Murray Cumming <murrayc src gnome org>]

commit d2395ee93ec37ef7ec31944eba0133b2c3db1b56
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Sep 19 21:52:42 2010 +0200

    2.25.5 changes from glibmm-2-26 branch.

 ChangeLog              |    4 ++--
 NEWS                   |   25 +++++++++++++++++++++++++
 configure.ac           |    4 ++--
 gio/src/gio_enums.defs |    1 +
 4 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1d405fc..95dc9b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -117,7 +117,7 @@ See the glibmm-2-26 branch too.
 	* gio/src/dbuserror.{ccg,hg}:
 	* gio/src/dbusutils.{ccg,hg}:
 	* gio/src/filelist.am: Add new sources wrapping C functions from the
-	D-Bus Utitiles and GDBusError gio DBus C API.  The GBDusError
+	D-Bus Utilities and GDBusError gio DBus C API.  The GBDusError
 	functions are wrapped in a new Gio::DBus::Error namespace.
 	* gio/src/dbusownname.hg:
 	* gio/src/dbuswatchname.hg: Typos.
@@ -167,7 +167,7 @@ See the glibmm-2-26 branch too.
 	* gio/src/dbusproxy.{ccg,hg}: Add the constructors and create methods
 	making sure that the order of the parameters allows for the
 	Cancellable to be optional.  Also made sure that the GDBusInterface
-	paramater is constant.
+	parameter is constant.
 
 	* gio/src/dbusconnection.ccg (DBusConnection): Rename the "observer"
 	property in the _CONSTRUCT macro to the correct
diff --git a/NEWS b/NEWS
index c3ffd53..7a867d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,28 @@
+2.25.5: (unstable):
+
+Gio:
+* Removed Application (removed in glib 2.26)
+  This is still in the git master versions.
+* DBusMessage: Added create_from_blob(), set/get_byte_order(), 
+  get_header_fields(), bytes_needed(), to_blob(), to_exception(), get_locked(), 
+  lock() and copy().
+* NetworkAddress: Added get_scheme() and property.
+* Added Proxy, ProxyAddress and ProxyResolver.
+* Settings: Added reset(), list_children(), list_keys().
+  (Murray Cumming)   
+* Added DBusAnnotationInfo, DBusArgInfo, DBusMethodInfo, DBusSignalInfo, 
+  DBusPropertyInfo, DBusInterfaceInfo, and DBusNodeInfo.
+* Added DBusProxy.
+* Added DBus::watch() and DBus::unwatch_name().
+* Several other DBus* improvements.
+  (José Alburquerque)
+
+Glib:
+* Variant: Added get_maybe(), get_size(), get_data(), store(), and 
+  get_n_children().
+* Added VariantIter.
+  (Murray Cumming)
+
 2.25.4: (unstable):
 
 Gio:
diff --git a/configure.ac b/configure.ac
index 8ef7ec6..ca5b23e 100644
--- 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.25.4],
+AC_INIT([glibmm], [2.25.5],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
         [glibmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -57,7 +57,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.25.15'
+glibreq='2.0 >= 2.25.16'
 GLIBMM_MODULES="sigc++-2.0 >= 2.0 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
 GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
 test "x$glibmm_host_windows" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq"
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index ae469ac..3cc5966 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -442,6 +442,7 @@
     '("busy" "G_IO_ERROR_BUSY" "26")
     '("would-block" "G_IO_ERROR_WOULD_BLOCK" "27")
     '("host-not-found" "G_IO_ERROR_HOST_NOT_FOUND" "28")
+    '("host-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
     '("would-merge" "G_IO_ERROR_WOULD_MERGE" "29")
     '("failed-handled" "G_IO_ERROR_FAILED_HANDLED" "30")
     '("too-many-open-files" "G_IO_ERROR_TOO_MANY_OPEN_FILES" "31")