[gtkmm] 2.91.5.1

[Murray Cumming <murrayc src gnome org>]

commit 40953fe0e2e093a51f361a5a71daef8509322bbf
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Dec 2 10:12:40 2010 +0100

    2.91.5.1

 ChangeLog           |   10 ++++++++++
 NEWS                |    4 ++++
 configure.ac        |    2 +-
 gtk/src/combobox.hg |    8 ++++----
 4 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f234f67..1a54cc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2.91.5.1:
+
+2010-12-02  Murray Cumming  <murrayc murrayc-desktop>
+
+	Temporarily remove methods that use GTK+ function not in GTK+ 2.91.5.
+
+	* gtk/src/combobox.hg: Some new functions were added after the 
+	GTK+ 2.91.5 release, so this allows gtkmm 2.91.5.1 to build with 
+	GTK+ 2.91.5.
+
 2.91.5:
 
 2010-11-30  Murray Cumming  <murrayc murrayc com>
diff --git a/NEWS b/NEWS
index 97dcd32..6992f1a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2.91.5.1 (unstable):
+
+Fix the build with GTK+ 2.91.5 by removing some newer GtkComboBox methods.
+
 2.91.5 (unstable):
 
 Gdk:
diff --git a/configure.ac b/configure.ac
index a2a22ab..6a9911a 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([gtkmm], [2.91.5],
+AC_INIT([gtkmm], [2.91.5.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
         [gtkmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 3e2d925..fd2a40e 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -169,10 +169,10 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Atk::Object> get_popup_accessible(), gtk_combo_box_get_popup_accessible, ifdef GTKMM_ATKMM_ENABLED)
   _WRAP_METHOD(Glib::RefPtr<const Atk::Object> get_popup_accessible() const, gtk_combo_box_get_popup_accessible, constversion, ifdef GTKMM_ATKMM_ENABLED)
   
-  _WRAP_METHOD(int get_id_column() const, gtk_combo_box_get_id_column)
-  _WRAP_METHOD(void set_id_column(int id_column), gtk_combo_box_set_id_column)
-  _WRAP_METHOD(Glib::ustring get_active_id() const, gtk_combo_box_get_active_id)
-  _WRAP_METHOD(void get_active_id(const Glib::ustring& active_id), gtk_combo_box_set_active_id)
+  //_WRAP_METHOD(int get_id_column() const, gtk_combo_box_get_id_column)
+  //_WRAP_METHOD(void set_id_column(int id_column), gtk_combo_box_set_id_column)
+  //_WRAP_METHOD(Glib::ustring get_active_id() const, gtk_combo_box_get_active_id)
+  //_WRAP_METHOD(void get_active_id(const Glib::ustring& active_id), gtk_combo_box_set_active_id)
 
   _IGNORE(gtk_combo_box_append_text, gtk_combo_box_insert_text, gtk_combo_box_prepend_text, gtk_combo_box_remove_text, gtk_combo_box_get_active_text) //deprecated