summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2006-06-05 20:35:43 +0000
committerMurray Cumming <murrayc@src.gnome.org>2006-06-05 20:35:43 +0000
commit6c4478b3cb0ee6eb358075ee3b0bb48e5c3d245e (patch)
tree1cbe61f4834187cf381102166c6549287ce64666
parentb12f0f32fa8dfba2c59458fd5d43c99866190dc1 (diff)
downloadglibmm-6c4478b3cb0ee6eb358075ee3b0bb48e5c3d245e.tar.gz
When using --enable-api-exception=no, only try to get the Glib::Error when
2006-06-05 Murray Cumming <murrayc@murrayc.com> * glib/src/convert.ccg: When using --enable-api-exception=no, only try to get the Glib::Error when the GError is not null.
-rw-r--r--ChangeLog2
-rw-r--r--NEWS6
-rw-r--r--configure.in2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e98d183e..e40e3cb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2.10.4:
+
2006-06-05 Murray Cumming <murrayc@murrayc.com>
* glib/src/convert.ccg: When using --enable-api-exception=no, only try to get the Glib::Error
diff --git a/NEWS b/NEWS
index a1a3e9fb..33c6267d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.10.4:
+
+* Convert functions: Do not try to throw null exceptions when using
+ --enable-api-exceptions=no.
+ (Murray Cumming)
+
2.10.3:
* gmmproc: Corrections to code generation, to prevent some methods from being empty.
diff --git a/configure.in b/configure.in
index 3deaf2a5..5babcdc2 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ AC_PREREQ(2.50)
#########################################################################
GLIBMM_MAJOR_VERSION=2
GLIBMM_MINOR_VERSION=10
-GLIBMM_MICRO_VERSION=3
+GLIBMM_MICRO_VERSION=4
GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION
GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION
AC_DEFINE_UNQUOTED(GLIBMM_MAJOR_VERSION, $GLIBMM_MAJOR_VERSION)