2.13.6:

2007-06-17  Murray Cumming  <murrayc@murrayc.com>

        * glib/src/regex.hg:
        * glib/src/matchinfo.hg: Removed API that uses GMatchInfo, until we 
        wrap this properly, probably as a C++ iterator. This will avoid this 
        API accidentally being released as stable sometime.

svn path=/trunk/; revision=418

7 files changed, 22 insertions, 106 deletions

diff --git a/ChangeLog b/ChangeLog
index 51dfd8f7..d448ac95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2.13.6:
+
+2007-06-17  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/src/regex.hg:
+	* glib/src/matchinfo.hg: Removed API that uses GMatchInfo, until we 
+	wrap this properly, probably as a C++ iterator. This will avoid this 
+	API accidentally being released as stable sometime.
+
 2007-06-12  Murray Cumming  <murrayc@murrayc.com>
 
 	* glib/src/glib_enums.defs: Regenerated with enums.pl
diff --git a/NEWS b/NEWS
index 9bf117c0..ef2397b8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+2.13.6:
+
+* Added Glib::Regex, an API for doing regular expression search/matching.
+  This is not fully wrapped yet, but the simple versions of the API are there.
+  We need to write an example for this.
+  (Murray Cumming)
+
 2.13.5:
 
 * Correctly ifdef-out initialization of deprecated classes.
diff --git a/configure.in b/configure.in
index 70d315ad..663fe6f7 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ AC_PREREQ(2.50)
 #########################################################################
 GLIBMM_MAJOR_VERSION=2
 GLIBMM_MINOR_VERSION=13
-GLIBMM_MICRO_VERSION=5
+GLIBMM_MICRO_VERSION=6
 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, [Major Version])
diff --git a/glib/src/Makefile_list_of_hg.am_fragment b/glib/src/Makefile_list_of_hg.am_fragment
index 39d7e54b..4cc446de 100644
--- a/glib/src/Makefile_list_of_hg.am_fragment
+++ b/glib/src/Makefile_list_of_hg.am_fragment
@@ -5,4 +5,4 @@
 
 files_posix_hg =
 files_win32_hg =
-files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg matchinfo.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg regex.hg shell.hg spawn.hg thread.hg unicode.hg
+files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg regex.hg shell.hg spawn.hg thread.hg unicode.hg
diff --git a/glib/src/matchinfo.ccg b/glib/src/matchinfo.ccg
deleted file mode 100644
index 73045990..00000000
--- a/glib/src/matchinfo.ccg
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 2007 The glibmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <glibmm/utility.h>
-
-// TODO: Remove this hack.
-// See bug http://bugzilla.gnome.org/show_bug.cgi?id=446723
-static GType gmatch_info_get_type()
-{
-  return 0;
-}
-
-static GMatchInfo* g_match_info_copy(GMatchInfo* info)
-{
-  return 0;
-}
-
-namespace Glib
-{
-
-
-} //namespace Glib
diff --git a/glib/src/matchinfo.hg b/glib/src/matchinfo.hg
deleted file mode 100644
index b280e675..00000000
--- a/glib/src/matchinfo.hg
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 2007 The glibmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-_DEFS(glibmm,glib)
-
-#include <glibmm/regex.h>
-#include <glibmm/value.h>
-
-#include <glib/gregex.h>
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-typedef struct _GMatchInfo GMatchInfo;
-#endif //DOXYGEN_SHOULD_SKIP_THIS
-
-namespace Glib
-{
-
-/** TODO
- *
- * @newin2p12
- */
-class MatchInfo
-{
-  //TODO: Use a different _CLASS_*() macro. GMatchInfo is not (yet) a boxed type.
-  //Or fix this one to allow NONE for the  copy function.
-  _CLASS_BOXEDTYPE(MatchInfo, GMatchInfo, NONE, g_match_info_copy, g_match_info_free)
-  _IGNORE(g_match_info_free)
-public:
- 
-  _WRAP_METHOD(Glib::RefPtr<Regex> get_regex(), g_match_info_get_regex, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Regex> get_regex() const, g_match_info_get_regex, constversion)
-
-  _WRAP_METHOD(Glib::ustring get_string() const, g_match_info_get_string)
-
-  _WRAP_METHOD(bool next(), g_match_info_next, errthrow)
-  _WRAP_METHOD(bool matches() const, g_match_info_matches)
-  _WRAP_METHOD(int get_match_count() const, g_match_info_get_match_count)
-  _WRAP_METHOD(bool is_partial_match() const, g_match_info_is_partial_match)
-  _WRAP_METHOD(Glib::ustring expand_references(const Glib::ustring& string_to_expand) const, g_match_info_expand_references, errthrow)
-  _WRAP_METHOD(Glib::ustring fetch(int match_num) const, g_match_info_fetch)
-  _WRAP_METHOD(bool fetch_pos(int match_num, int& start_pos, int& end_pos) const, g_match_info_fetch_pos)
-  _WRAP_METHOD(Glib::ustring fetch_named(const Glib::ustring& name) const, g_match_info_fetch_named)
-  _WRAP_METHOD(bool fetch_named_pos(const  Glib::ustring& name, int& start_pos, int& end_pos) const, g_match_info_fetch_named_pos)
-
-  #m4 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_DEEP)')
-  _WRAP_METHOD(Glib::StringArrayHandle fetch_all	() const, g_match_info_fetch_all)
-};
-
-
-} // namespace Glib
-
diff --git a/glib/src/regex.hg b/glib/src/regex.hg
index 6a545d8b..eafe8cb8 100644
--- a/glib/src/regex.hg
+++ b/glib/src/regex.hg
@@ -63,7 +63,8 @@ public:
   //TODO: _WRAP_METHOD(bool match(const Glib::ustring& string, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo **match_info = 0), g_regex_match)
   bool match(const Glib::ustring& string, RegexMatchFlags match_options = (RegexMatchFlags)0);
 
-  _WRAP_METHOD(bool match_full(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo** match_info = 0), g_regex_match_full, errthrow)
+  //TODO: Wrap GMatchInfo as an iterator:
+  //_WRAP_METHOD(bool match_full(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo** match_info = 0), g_regex_match_full, errthrow)
 
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool match_full(const Glib::ustring& string, int start_position, RegexMatchFlags match_options);
@@ -77,10 +78,10 @@ public:
   bool match_full(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, std::auto_ptr<Glib::Error>& error);
   #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-  _WRAP_METHOD(bool match_all(const Glib::ustring& string, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo ** match_info = 0), g_regex_match_all)
+  //TODO: _WRAP_METHOD(bool match_all(const Glib::ustring& string, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo ** match_info = 0), g_regex_match_all)
   bool match_all(const Glib::ustring& string, RegexMatchFlags match_options = (RegexMatchFlags)0);
 
-  _WRAP_METHOD(bool match_all_full(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo** match_info = 0), g_regex_match_all_full, errthrow)
+  //TODO: _WRAP_METHOD(bool match_all_full(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo** match_info = 0), g_regex_match_all_full, errthrow)
 
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool match_all_full(const Glib::ustring& string, int start_position, RegexMatchFlags match_options);