[glibmm/glibmm-2-20: 196/196] Merge branch 'master' into glibmm-2-20

[Daniel Elstner <daniel src gnome org>]

commit ad90c8602b53360a4026d2b093bd49d8fd1dda54
Merge: 4d3782a... 66a22f7...
Author: Daniel Elstner <danielk openismus com>
Date:   Wed Sep 16 13:55:54 2009 +0200

    Merge branch 'master' into glibmm-2-20

 ChangeLog              |   67 +++++++++++++
 autogen.sh             |    4 +-
 tools/gmmproc.in       |   51 +++++------
 tools/pm/DocsParser.pm |   10 +-
 tools/pm/Output.pm     |    2 +-
 tools/pm/WrapParser.pm |  244 +++++++++++++++++++++++-------------------------
 6 files changed, 213 insertions(+), 165 deletions(-)
---
diff --cc ChangeLog
index 32b8a36,d781985..15f7f15
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,25 -1,121 +1,92 @@@
+ 2009-09-13  Daniel Elstner  <daniel kitta gmail com>
+ 
+ 	Enable verbose output of autoreconf
+ 
+ 	* autogen.sh: Pass --verbose option to autoreconf.
+ 
+ 2009-09-11  Daniel Elstner  <danielk openismus com>
+ 
+ 	Correctly quote the extracted comment for M4
+ 
+ 	* tools/pm/WrapParser.pm (extract_preceding_documentation): Add M4
+ 	quotes around the extracted comment, since it may contain sequences
+ 	of end-quote + macro + start-quote.
+ 
+ 2009-09-11  Daniel Elstner  <danielk openismus com>
+ 
+ 	Slightly clean up gross Perl code in gmmproc.in
+ 
+ 	* tools/gmmproc.in: Try not to abuse Perl too much, and get rid of
+ 	the 'no warnings' hammer.
+ 
+ 2009-09-10  Daniel Elstner  <danielk openismus com>
+ 
+ 	Allow the C documentation to be overridden
+ 
+ 	* tools/pm/WrapParser.pm (extract_preceding_documentation): Factor
+ 	the code from on_wrap_enum() to extract a preceding comment block
+ 	into a separate subroutine.
+ 	(on_wrap_method): Invoke extract_preceding_documentation() to
+ 	extract a preceding Doxygen comment, and if one was found allow
+ 	it to override the inherited C documentation.
+ 
+ 2009-09-10  Daniel Elstner  <danielk openismus com>
+ 
+ 	Fix broken test for empty _WRAP_METHOD argument
+ 
+ 	* tools/pm/DocsParser.pm: Escape variable values substituted into
+ 	regular expressions.
+ 	* tools/pm/Output.pm (output_wrap_property): Transliterate using
+ 	tr/// instead of s///g.
+ 	* tools/pm/WrapParser.pm: Correct a number of worst offenders among
+ 	all the bad Perl code.
+ 	(on_wrap_{ctor,method,corba_method}): Instead of testing whether
+ 	the prototype argument does not consist solely of non-whitespace
+ 	characters, actually do what the accompanying comment claimed and
+ 	test whether the argument is empty or consists only of whitespace.
+ 	The only reason this age-old bug was never triggered is that there
+ 	is always at least one whitespace character in a prototype, namely
+ 	between the return type and the function name.  The only exception
+ 	would be the default constructor, which however just so happens to
+ 	have its own special _CTOR_DEFAULT macro.
+ 	In a nutshell, the bug itself was broken and failed to properly
+ 	break things.
+ 
+ 2009-09-10  Daniel Elstner  <danielk openismus com>
+ 
+ 	Re-enable input file line markers in gmmproc
+ 
+ 	* tools/pm/WrapParser.pm: Replace hairy uses of scalar(@array)
+ 	to get the number of array elements by $#array, which returns
+ 	the index of the last element.
+ 	(read_file): Re-enable the commented
+ 	code which used to insert input file and line information into
+ 	the token list.
+ 	(parse_and_build_output): Use a simple regular expression to
+ 	match the start of a string instead of messing with substr().
+ 
 -2009-09-08  Jonathon Jongsma  <jonathon jongsma collabora co uk>
 -
 -	* examples/Makefile.am:
 -	* gio/giomm.h:
 -	* gio/src/filelist.am: disable more network io stuff that was
 -	causing distcheck to fail
 -
 -2009-09-08  Jonathon Jongsma  <jonathon jongsma collabora co uk>
 -
 -	* NEWS: update for release
 -	* configure.ac: increment version to 2.21.5
 -
 -2009-09-08  Jonathon Jongsma  <jonathon jongsma collabora co uk>
 -
 -	* gio/src/filelist.am: disable network IO stuff for now since it's
 -	too close to the stable release and we don't want to have unfinished
 -	API that isn't well-tested.
 +2009-09-07  Daniel Elstner  <danielk openismus com>
  
 -2009-09-08  Jonathon Jongsma  <jonathon jongsma collabora co uk>
 +	Officially deprecate GLIBMM_CHECK_PERL macro
  
 -	* gio/src/inetaddress.hg:
 -	* gio/src/networkaddress.hg:
 -	* gio/src/networkservice.hg:
 -	* gio/src/resolver.hg:
 -	* gio/src/socket.hg:
 -	* gio/src/socketaddress.hg:
 -	* gio/src/socketaddressenumerator.hg:
 -	* gio/src/socketconnectable.hg:
 -	* gio/src/srvtarget.hg: add all network io classes to a new doxygen
 -	NetworkIO module
 +	* build/glibmm_check_perl.m4 (GLIBMM_CV_PERL_VERSION): Define with
 +	m4_define() so that the macro is only visible internally.
 +	(GLIBMM_CHECK_PERL): Define as deprecated macro using AU_DEFUN().
  
 -2009-09-08  Daniel Elstner  <danielk openismus com>
 +2009-09-07  Daniel Elstner  <danielk openismus com>
  
 -	Implement Gio::Socket ctors using Gio::Initable
 +	Correct GLib version requirement to 2.20.0
  
 -	* gio/src/gio_vfuncs.defs: Add GInitableClass::init() vfunc.
 -	* gio/src/initable.{ccg,hg} (Initable::init): Use _WRAP_METHOD().
 -	(Initable::init_vfunc): Wrap GInitableClass::init() vfunc.
 -	* gio/src/socket.{ccg,hg} (Socket::Socket): Wrap constructors
 -	manually.  Call Initable::init() from the constructor body.
 -	(Socket::create), (Socket::create_from_fd): Forward to constructors.
 -	* tools/m4/convert_gio.m4: Add conversion from GCancellable* to
 -	const Glib::RefPtr<Cancellable>&.
 +	* configure.ac (glibreq): Lower minimum GLib version to 2.20.0,
 +	as this is the stable branch.
  
 -2009-09-07  Daniel Elstner  <danielk openismus com>
 +2009-09-05  Daniel Elstner  <danielk openismus com>
  
 -	Officially deprecate GLIBMM_CHECK_PERL macro
 +	Do not hide deprecated GLib functions
  
 -	* build/glibmm_check_perl.m4 (GLIBMM_CV_PERL_VERSION): Define with
 -	m4_define() so that the macro is only visible internally.
 -	(GLIBMM_CHECK_PERL): Define as deprecated macro using AU_DEFUN().
 +	* configure.ac (MM_ARG_ENABLE_WARNINGS): Remove the list of
 +	deprecation macro prefixes, in order to keep the stable branch
 +	buildable even with the latest unstable GLib.
  
  2009-09-03  Daniel Elstner  <danielk openismus com>