[glibmm: 8/8] Merge initial gnio wrappers

[Jonathon Jongsma <jjongsma src gnome org>]

commit 3a5c0b8a0af57289669b779935a3568609b2a574
Merge: 7fdfd4e... e09d094...
Author: Jonathon Jongsma <jonathon quotidian org>
Date:   Thu Jun 18 11:39:54 2009 -0500

    Merge initial gnio wrappers
    
    Conflicts:
    	ChangeLog

 ChangeLog              |   16 +++++++++++++++-
 tools/pm/DocsParser.pm |   17 ++++++++++++++---
 tools/pm/GtkDefs.pm    |   17 ++++++++++++++++-
 3 files changed, 45 insertions(+), 5 deletions(-)
---
diff --cc ChangeLog
index 5bdfa3d,5cd4311..d87b724
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,56 -1,17 +1,70 @@@
 +2009-06-18  Jonathon Jongsma  <jonathon quotidian org>
 +
 +	* configure.ac: bump version and glib version requirement
 +
 +2009-06-18  Jonathon Jongsma  <jonathon quotidian org>
 +
 +	* gio/src/socketconnectable.ccg:
 +	* gio/src/socketconnectable.hg: add overloads without a
 +	  'cancellable' argument for SocketAddressEnumerator methods
 +
 +2009-06-18  Jonathon Jongsma  <jonathon quotidian org>
 +
 +	* gio/src/gio_methods.defs: re-generate
 +	* gio/src/socketaddress.hg: uncomment method that was being
 +	  generated incorrectly due to out-of-date .defs
 +	* gio/src/socketconnectable.ccg:
 +	* gio/src/socketconnectable.hg: wrap the next_async() manually
 +	  because we need to do the slot adaptation stuff
 +
 +2009-06-18  Jonathon Jongsma  <jonathon quotidian org>
 +
 +	* gio/src/resolver.ccg:
 +	* gio/src/resolver.hg: remove some overloads for now and get the
 +	  lookup_service() API working with the list of SrvTargets
 +	* gio/src/srvtarget.hg: add TypeTraits for lists of SrvTargets
 +
 +2009-06-17  Jonathon Jongsma  <jonathon quotidian org>
 +
 +	Add initial wrappers for SocketConnectable, SocketAddress
 +
 +	* .gitignore:
 +	* gio/src/Makefile_list_of_hg.am_fragment:
 +	* gio/src/enums.hg:
 +	* gio/src/inetaddress.hg:
 +	* gio/src/resolver.hg:
 +	* gio/src/socketaddress.ccg: Copied from gio/src/error.ccg.
 +	* gio/src/socketaddress.hg: Copied from gio/src/fileicon.hg.
 +	* gio/src/socketconnectable.ccg: Copied from gio/src/filemonitor.ccg.
 +	* gio/src/socketconnectable.hg: Added.
 +	* tools/m4/convert_gio.m4:
 +
 +2009-06-17  Jonathon Jongsma  <jonathon quotidian org>
 +
 +	Initial wrapping for SrvTarget, Resolver
 +
 +	* .gitignore:
 +	* gio/src/Makefile_list_of_hg.am_fragment:
 +	* gio/src/resolver.ccg: Added.
 +	* gio/src/resolver.hg: Added.
 +	* gio/src/srvtarget.ccg: Added
 +	* gio/src/srvtarget.hg: Added.
 +	* tools/m4/convert_gio.m4:
 +
+ 2009-06-18  Murray Cumming  <murrayc murrayc com>
+ 
+   Add debug output to hint that your .defs needs a define-object.
+ 	
+ 	* tools/pm/DocsParser.pm: lookup_object_of_method(),
+ 	* tools/pm/GtkDefs.pm: lookup_object(): Add debug output to hint that you 
+ 	need a define-object for each C GType in the *.defs file, though I 
+ 	do not yet know why these are sometimes missing.
+ 
+ 2009-06-18  Murray Cumming  <murrayc murrayc com>
+ 
+ 	* configure.ac: Require glib 2.21, because g_cancellable_connect/disconnect() 
+ 	are not in glib 2.20.
+ 
  2009-06-17  Hubert Figuiere  <hub figuiere net>
  
  	* gio/src/file.hg: