Include glib.h instead of gmessages.h or gtestutils.h so this builds with

2007-12-28  Murray Cumming  <murrayc@murrayc.com>

* glib/glibmm/error.cc:
* glib/glibmm/exception.cc:
* glib/src/convert.ccg:
* glib/src/date.ccg: Include glib.h instead of gmessages.h or 
gtestutils.h so this builds with all versions of glib.

svn path=/trunk/; revision=474

6 files changed, 103 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 5fa2e46a..1891b245 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-12-28  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/glibmm/error.cc:
+	* glib/glibmm/exception.cc:
+	* glib/src/convert.ccg:
+	* glib/src/date.ccg: Include glib.h instead of gmessages.h or 
+	gtestutils.h so this builds with all versions of glib.
+
+2007-12-17  Marko Anastasov  <marko.anastasov@gmail.com>
+
+	* glib/glibmm/exception.cc:
+	* glib/glibmm/error.cc:
+	* glib/src/date.ccg:
+	* glib/src/convert.ccg: Include gtestutils.h instead of gmessages.h
+	for g_assert* adapting to glib head.
+
 2007-11-20  Sebastien Bacher  <seb128@ubuntu.com>
 
 	* glib/glibmm/object.cc: fix build issue when using gcc4.3 (#498438)
diff --git a/NEWS b/NEWS
index babc758b..808d675d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,72 @@
+2.15.0:
+
+* Glib::RefPtr: Deprecate clear(), replacing it with 
+  reset(), because people often do treemodel.clear() when they 
+  mean treemodel->clear(). reset() is consistent with std::auto_ptr<>.
+  But the method is still there so the compiler still can't help 
+  you to avoid the mistake.
+  (Murray Cumming)
+* gmmproc:
+  - Refuse to generate a wrapper for a construct-only 
+  property which is also write-only, and display a warning.
+  (Daniel Elstner, bug #436789)
+  - Added _DERIVES_INITIALLY_UNOWNED to sink floating 
+  references in constructor of classes that wrap 
+  GInitiallyUnowned-derived GTypes. Plus _INITIALLY_UNOWNED_SINK 
+  for hand-written constructors.
+  (Murray Cumming)
+* Build:
+- Fix build for glib 2.15 by including 
+  gtestutils.h instead of gmessages.h to get g_assert(), 
+  though I am angry that this API break has been allowed.
+  (Murray Cumming)
+- Fix build for pre-releases of gcc 4.3 - also an include 
+  issue. (Sebastien Bacher, #498438)
+
+2.14.2:
+
+* Build: Hopefully fix the build on NetBSD-4.99.6/amd64.
+  Bug #386990. (was already in 2.12.7) (Murray Cumming)
+* gmmproc: Added support for the new _CONFIGINCLUDE() macro.
+  (Armin Burgmeier)
+
+2.14.1:
+
+* Glib::wrap(): Don't fail when wrapping an interface that 
+  is implemented by an unrecognized type.
+  gmmproc-generated code now uses the new wrap_auto_interface(), 
+  so newly-generated source code will require this latest glibmm 
+  version.
+* Increase version number check for glib.
+  (Rémi Cardona)
+
+2.14:
+
+Changes sinze 2.12:
+
+* New Regex class, allowing string searching with regular expressions.
+  (Murray Cumming, Daniel Elstner)
+* New KeyFile class.
+  (Rob Page, Jonathan Jongsma, Murray Cumming)
+* Main: Added SignalTimeout::connect_seconds().
+  (Murray Cumming)
+* OptionContext: Added get/set_summary(), get/set_description(), 
+  set_translation_domain() and set_translate_func().
+  (Jonathan Jongsma)
+* Added Glib::get_user_special_dir(), get_user_data_dir(),
+  get_user_config_dir(), and get_user_cache_dir().
+  (Jonathan Jongsma, Murray Cumming)
+* Improved documentation.
+  (Johannes Schmid, Jonathan Jongsma, Ralf Stephan)
+
+2.14.0:
+
+* Regex:
+  - Add escape_string().
+  - match_full(): Rename to match().
+  - match_all_full(): Rename to match_all().
+  - split_full(): Rename to split().
+
 2.13.9:
 
 * KeyFile: Added Added get_double(), set_double(), get_double_list() 
diff --git a/glib/glibmm/error.cc b/glib/glibmm/error.cc
index fea6d660..49160c15 100644
--- a/glib/glibmm/error.cc
+++ b/glib/glibmm/error.cc
@@ -21,7 +21,10 @@
  */
 
 #include <glib/gerror.h>
-#include <glib/gmessages.h>
+
+//#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0
+//#include <glib/gmessages.h> //For g_assert() in glib < 2.15.0
+#include <glib.h> //For g_assert() in all versions of glib.
 
 #include <map>
 #include <glibmmconfig.h>
diff --git a/glib/glibmm/exception.cc b/glib/glibmm/exception.cc
index 22345b28..6db71af4 100644
--- a/glib/glibmm/exception.cc
+++ b/glib/glibmm/exception.cc
@@ -20,7 +20,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib/gmessages.h>
+//#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0
+//#include <glib/gmessages.h> //For g_assert() in glib < 2.15.0
+#include <glib.h> //For g_assert() in all versions of glib.
+
 #include <glibmm/exception.h>
 
 
diff --git a/glib/src/convert.ccg b/glib/src/convert.ccg
index 5ea705a3..146cec5a 100644
--- a/glib/src/convert.ccg
+++ b/glib/src/convert.ccg
@@ -1,5 +1,5 @@
 // -*- c++ -*-
-/* $Id$ */
+/* $Id: convert.ccg,v 1.4 2006/06/05 17:32:14 murrayc Exp $ */
 
 /* Copyright (C) 2002 The gtkmm Development Team
  *
@@ -19,7 +19,11 @@
  */
 
 #include <glib/gconvert.h>
-#include <glib/gmessages.h>
+
+//#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0
+//#include <glib/gmessages.h> //For g_assert() in glib < 2.15.0
+#include <glib.h> //For g_assert() in all versions of glib.
+
 #include <glib/gunicode.h>
 #include <glibmm/utility.h>
 
diff --git a/glib/src/date.ccg b/glib/src/date.ccg
index 8f66c8e8..3443b8fa 100644
--- a/glib/src/date.ccg
+++ b/glib/src/date.ccg
@@ -19,7 +19,10 @@
  */
 
 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+
+//#include <glib/gtestutils.h> //For g_assert() in glib >= 2.15.0
+//#include <glib/gmessages.h> //For g_assert() in glib < 2.15.0
+#include <glib.h> //For g_assert() in all versions of glib.
 
 #include <ctime>
 #include <algorithm>