From 45789a442c8acbe7d57f61510646d4d4cdf14d4b Mon Sep 17 00:00:00 2001
From: Murray Cumming <murrayc@murrayc.com>
Date: Mon, 7 Mar 2005 15:42:20 +0000
Subject: 2.6.1:

2005-03-07  Murray Cumming  <murrayc@murrayc.com>

        * glib/glibmm/interface.cc: Disable the new check for pre-existing
        interface implementations, because it checks all base gtypes and
        not just the current gtype. Bug #169442 by Bryan Forbes.
---
 ChangeLog                | 8 ++++++++
 NEWS                     | 6 ++++++
 configure.in             | 4 ++--
 glib/glibmm/interface.cc | 7 ++++---
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a54ac77..0bddbef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2.6.1:
+
+2005-03-07  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/glibmm/interface.cc: Disable the new check for pre-existing 
+	interface implementations, because it checks all base gtypes and 
+	not just the current gtype. Bug #169442 by Bryan Forbes.
+
 2.6.0:
 
 2.5.6:
diff --git a/NEWS b/NEWS
index 04197b5e..9edbf661 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.6.1:
+
+* Interface::add_interface(): Disabled the check for a second call, 
+  introduced in 2.6.0, for now, because it stops some valid uses.
+  (Bryan Forbes)
+
 2.6.0:
 
 New stable version. Changes compare to glibmm 2.4.x:
diff --git a/configure.in b/configure.in
index 1a3a92de..03b31169 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ AC_PREREQ(2.50)
 #########################################################################
 GLIBMM_MAJOR_VERSION=2
 GLIBMM_MINOR_VERSION=6
-GLIBMM_MICRO_VERSION=0
+GLIBMM_MICRO_VERSION=1
 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)
@@ -38,7 +38,7 @@ AC_SUBST(GLIBMM_RELEASE)
 #  ? :+1 : ?   == just some internal changes, nothing breaks but might work 
 #                 better
 # CURRENT : REVISION : AGE
-LIBGLIBMM_SO_VERSION=1:12:0
+LIBGLIBMM_SO_VERSION=1:13:0
 AC_SUBST(LIBGLIBMM_SO_VERSION)
 
 AC_CONFIG_AUX_DIR(scripts)
diff --git a/glib/glibmm/interface.cc b/glib/glibmm/interface.cc
index 95b74137..d3ade452 100644
--- a/glib/glibmm/interface.cc
+++ b/glib/glibmm/interface.cc
@@ -29,8 +29,9 @@ namespace Glib
 
 void Interface_Class::add_interface(GType instance_type) const
 {
-  if( !g_type_is_a(instance_type, gtype_) ) //For convenience, don't complain about calling this twice.
-  {
+  //This check is distabled, because it checks whether any of the types's bases implement the interface, not just the specific type.
+  //if( !g_type_is_a(instance_type, gtype_) ) //For convenience, don't complain about calling this twice.
+  //{
     const GInterfaceInfo interface_info =
     {
       class_init_func_,
@@ -39,7 +40,7 @@ void Interface_Class::add_interface(GType instance_type) const
     };
 
     g_type_add_interface_static(instance_type, gtype_, &interface_info);
-  }
+  //}
 }
 
 
-- 
cgit v1.2.1