Increase version

svn path=/trunk/; revision=546

5 files changed, 47 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index c3701b4e..ecd1fbc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2.15.3:
+
 2008-01-27  Murray Cumming  <murrayc@murrayc.com>
 
 	* gio/src/fileattribute.ccg:
diff --git a/Makefile.am b/Makefile.am
index 63c5263a..90ee5f99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST	= build_shared/Makefile_build.am_fragment \
 		  build_shared/Makefile_build_gensrc.am_fragment \
 		  build_shared/Makefile_gensrc.am_fragment \
 		  build_shared/Makefile_conditional.am_fragment \
-		  CHANGES README.win32
+		  README.win32
 
 
 all-local:
diff --git a/NEWS b/NEWS
index 2b09b951..50d63915 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+2.15.3 (unstable):
+
+Glib:
+* FilterInputStream: Really wrap this.
+* VolumeMonitor: Workaround a crash in gio due to the 
+  eccentric use of the GType system to discover GVolumeMonitor 
+  implementations. See gio bug #511814.
+* Added Gio::Error exception.
+* Added more method overloads without optional parameters, and 
+  reordered more parameters to allow default values. 
+  (Murray Cumming)
+* giomm.h: Added includes.
+  (Jonathan Jongsma)
+
+* Note that there are some examples in the gtkmm-documentation module.
+
+
 2.15.2 (unstable):
 
 Glib:
diff --git a/configure.in b/configure.in
index dac09b2c..95b4cfd1 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,14 @@
 #  Copyright 1999 gtkmm Development Team
 #  Copyright 1998 Stephan Kulow 
 #
-AC_INIT([glibmm], [2.15.2])
+
+pushdef([GLIBMM_MAJOR_VERSION],     [2])
+pushdef([GLIBMM_MINOR_VERSION],     [15])
+pushdef([GLIBMM_MICRO_VERSION],     [3])
+pushdef([GLIBMM_EXTRA_VERSION],     [])
+pushdef([GLIBMM_VERSION], GLIBMM_MAJOR_VERSION.GLIBMM_MINOR_VERSION.GLIBMM_MICRO_VERSION[]GLIBMM_EXTRA_VERSION)
+
+AC_INIT([glibmm], GLIBMM_VERSION, [gtkmm-list@gnome.org])
 AC_PREREQ([2.58])
 AC_CONFIG_SRCDIR([glib/glibmmconfig.h.in])
 AC_CONFIG_MACRO_DIR([scripts])
@@ -19,14 +26,20 @@ AC_CONFIG_MACRO_DIR([scripts])
 #########################################################################
 #  Version and initialization
 #########################################################################
-GLIBMM_MAJOR_VERSION=2
-GLIBMM_MINOR_VERSION=15
-GLIBMM_MICRO_VERSION=0
-GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION
+[GLIBMM_MAJOR_VERSION]=GLIBMM_MAJOR_VERSION
+[GLIBMM_MINOR_VERSION]=GLIBMM_MINOR_VERSION
+[GLIBMM_MICRO_VERSION]=GLIBMM_MICRO_VERSION
+[GLIBMM_EXTRA_VERSION]=GLIBMM_EXTRA_VERSION
+[GLIBMM_VERSION]=GLIBMM_VERSION
+popdef([GLIBMM_MAJOR_VERSION])
+popdef([GLIBMM_MINOR_VERSION])
+popdef([GLIBMM_MICRO_VERSION])
+popdef([GLIBMM_EXTRA_VERSION])
+popdef([GLIBMM_VERSION])
 GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION
-AC_DEFINE_UNQUOTED([GLIBMM_MAJOR_VERSION], $GLIBMM_MAJOR_VERSION, [Major Version])
-AC_DEFINE_UNQUOTED([GLIBMM_MINOR_VERSION], $GLIBMM_MINOR_VERSION, [Minor Version])
-AC_DEFINE_UNQUOTED([GLIBMM_MICRO_VERSION], $GLIBMM_MICRO_VERSION, [Micro Version])
+AC_DEFINE_UNQUOTED(GLIBMM_MAJOR_VERSION, $GLIBMM_MAJOR_VERSION, [Major version of gtkmm])
+AC_DEFINE_UNQUOTED(GLIBMM_MINOR_VERSION, $GLIBMM_MINOR_VERSION, [Minor version of gtkmm])
+AC_DEFINE_UNQUOTED(GLIBMM_MICRO_VERSION, $GLIBMM_MICRO_VERSION, [Micro version of gtkmm])
 AC_SUBST(GLIBMM_MAJOR_VERSION)
 AC_SUBST(GLIBMM_MINOR_VERSION)
 AC_SUBST(GLIBMM_MICRO_VERSION)
@@ -118,7 +131,7 @@ AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo])
 #  Dependancy checks
 #########################################################################
 gtkmm_min_sigc_version=2.0.0
-gtkmm_min_glib_version=2.15.0
+gtkmm_min_glib_version=2.15.3
 
 PKG_CHECK_MODULES(GLIBMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version})
 AC_SUBST(GLIBMM_CFLAGS)
diff --git a/gio/src/volumemonitor.hg b/gio/src/volumemonitor.hg
index b8ad54ce..18f9fe2c 100644
--- a/gio/src/volumemonitor.hg
+++ b/gio/src/volumemonitor.hg
@@ -36,6 +36,9 @@ _WRAP_ENUM(VolumeMonitorEvent, GVolumeMonitorEvent, NO_GTYPE)
 class VolumeMonitor : public Glib::Object
 {
   _CLASS_GOBJECT(VolumeMonitor, GVolumeMonitor, G_VOLUME_MONITOR, Glib::Object, GObject)
+   //We do not create a derived GType for this wrapper class because gio would then try to use it as a possible native volume monitor.
+   //See bug http://bugzilla.gnome.org/show_bug.cgi?id=511814
+   //Note that this means that we can't have default signal handlers of vfuncs.
   _DO_NOT_DERIVE_GTYPE
 protected:
 
@@ -58,7 +61,8 @@ public:
   _WRAP_METHOD(static Glib::RefPtr<Volume> adopt_orphan_mount(const Glib::RefPtr<Mount>& mount), g_volume_monitor_adopt_orphan_mount)
 
   
-  //TODO: vfuncs and signals.
+  //TODO: signals
+  //We can't wrap the vfuncs because we are using DO_NOT_DERIVE_GTYPE.
 
   //There are no properties.
 };