[glibmm/vector: 6/6] Merge branch 'master' into vector

[Krzesimir Nowak <krnowak src gnome org>]

commit 2be873238f7d693ae66bc461fd83bc006202a23b
Merge: e912f5b 4ba9633
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Fri Jan 21 22:48:34 2011 +0100

    Merge branch 'master' into vector
    
    Conflicts:
    	gio/src/resolver.ccg
    	gio/src/resolver.hg

 ChangeLog                 |   28 ++++++++++++++++++++--------
 gio/src/application.ccg   |   19 ++++++++++++++-----
 gio/src/application.hg    |   13 ++++++++++---
 gio/src/resolver.ccg      |    4 ++--
 gio/src/resolver.hg       |   23 +++++++++++++++++++++--
 glib/glibmm/objectbase.cc |   23 ++++-------------------
 6 files changed, 71 insertions(+), 39 deletions(-)
---
diff --cc gio/src/resolver.ccg
index b64af1f,fb63c06..6fcc5c3
--- a/gio/src/resolver.ccg
+++ b/gio/src/resolver.ccg
@@@ -36,10 -33,10 +36,10 @@@ void Resolver::set_default(const Glib::
      g_resolver_set_default(Glib::unwrap(resolver));
  }
  
 -Glib::ListHandle< Glib::RefPtr<InetAddress> > Resolver::lookup_by_name(const Glib::ustring& hostname)
 +std::vector< Glib::RefPtr<InetAddress> > Resolver::lookup_by_name(const Glib::ustring& hostname)
  {
    GError* gerror = 0;
-   std::vector< Glib::RefPtr<InetAddress> > retvalue = Glib::ListHandler< Glib::RefPtr<InetAddress> >::list_to_vector(g_resolver_lookup_by_name(gobj(), hostname.c_str(), 0, &(gerror)), Glib::OWNERSHIP_SHALLOW);
 -  Glib::ListHandle< Glib::RefPtr<InetAddress> > retvalue = Glib::ListHandle< Glib::RefPtr<InetAddress> >(g_resolver_lookup_by_name(gobj(), hostname.c_str(), 0, &(gerror)), Glib::OWNERSHIP_DEEP);
++  std::vector< Glib::RefPtr<InetAddress> > retvalue = Glib::ListHandler< Glib::RefPtr<InetAddress> >::list_to_vector(g_resolver_lookup_by_name(gobj(), hostname.c_str(), 0, &(gerror)), Glib::OWNERSHIP_DEEP);
    if(gerror)
      ::Glib::Error::throw_exception(gerror);
  
@@@ -58,10 -55,10 +58,10 @@@ Glib::ustring Resolver::lookup_by_addre
  
  }
  
 -ListHandle_SrvTarget Resolver::lookup_service(const Glib::ustring& service, const Glib::ustring& protocol, const Glib::ustring& domain)
 +std::vector<Gio::SrvTarget> Resolver::lookup_service(const Glib::ustring& service, const Glib::ustring& protocol, const Glib::ustring& domain)
  {
    GError* gerror = 0;
-   std::vector<Gio::SrvTarget> retvalue = Glib::ListHandler<Gio::SrvTarget, SrvTargetTraits>::list_to_vector (g_resolver_lookup_service(gobj(), service.c_str(), protocol.c_str(), domain.c_str(), 0, &(gerror)), Glib::OWNERSHIP_SHALLOW);
 -  ListHandle_SrvTarget retvalue = ListHandle_SrvTarget(g_resolver_lookup_service(gobj(), service.c_str(), protocol.c_str(), domain.c_str(), 0, &(gerror)), Glib::OWNERSHIP_DEEP);
++  std::vector<Gio::SrvTarget> retvalue = Glib::ListHandler<Gio::SrvTarget, SrvTargetTraits>::list_to_vector (g_resolver_lookup_service(gobj(), service.c_str(), protocol.c_str(), domain.c_str(), 0, &(gerror)), Glib::OWNERSHIP_DEEP);
    if(gerror)
      ::Glib::Error::throw_exception(gerror);
  
diff --cc gio/src/resolver.hg
index 04c86bb,589c7a2..bea7d11
--- a/gio/src/resolver.hg
+++ b/gio/src/resolver.hg
@@@ -60,31 -58,51 +60,50 @@@ public
    // g_resolver_free_addresses is just a C convenience function
    _IGNORE(g_resolver_free_addresses)
  
- #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<InetAddress> >',`Glib::ListHandler< Glib::RefPtr<InetAddress> >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
 -#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<InetAddress> >',`$2($3, Glib::OWNERSHIP_DEEP)')
 -  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<InetAddress> > lookup_by_name(const Glib::ustring& hostname, const Glib::RefPtr<Cancellable>& cancellable), g_resolver_lookup_by_name, errthrow)
 -  
++#m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<InetAddress> >',`Glib::ListHandler< Glib::RefPtr<InetAddress> >::list_to_vector($3, Glib::OWNERSHIP_DEEP)')
 +  _WRAP_METHOD(std::vector< Glib::RefPtr<InetAddress> > lookup_by_name(const Glib::ustring& hostname, const Glib::RefPtr<Cancellable>& cancellable), g_resolver_lookup_by_name, errthrow)
++
+   //TODO: Documentation
 -  Glib::ListHandle< Glib::RefPtr<InetAddress> > lookup_by_name(const Glib::ustring& hostname);
 -  
 +  std::vector< Glib::RefPtr<InetAddress> > lookup_by_name(const Glib::ustring& hostname);
++
+   //TODO: Documentation
    void lookup_by_name_async(const Glib::ustring& hostname, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable);
+   
+   //TODO: Documentation
    void lookup_by_name_async(const Glib::ustring& hostname, const SlotAsyncReady& slot);
    _IGNORE(g_resolver_lookup_by_name_async)
 -  
 -  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<InetAddress> > lookup_by_name_finish(const Glib::RefPtr<AsyncResult>& result), g_resolver_lookup_by_name_finish, errthrow)
++
 +  _WRAP_METHOD(std::vector< Glib::RefPtr<InetAddress> > lookup_by_name_finish(const Glib::RefPtr<AsyncResult>& result), g_resolver_lookup_by_name_finish, errthrow)
  
    _WRAP_METHOD(Glib::ustring lookup_by_address(const Glib::RefPtr<InetAddress>& address, const Glib::RefPtr<Cancellable>& cancellable), g_resolver_lookup_by_address, errthrow)
+   
+   //TODO: Documentation
    Glib::ustring lookup_by_address(const Glib::RefPtr<InetAddress>& address);
    void lookup_by_address_async(const Glib::RefPtr<InetAddress>& address, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable);
+   
+   //TODO: Documentation
    void lookup_by_address_async(const Glib::RefPtr<InetAddress>& address, const SlotAsyncReady& slot);
    _IGNORE(g_resolver_lookup_by_address_async)
+   
    _WRAP_METHOD(Glib::ustring lookup_by_address_finish(const Glib::RefPtr<AsyncResult>& result), g_resolver_lookup_by_address_finish, errthrow)
  
- #m4 _CONVERSION(`GList*',`std::vector<Gio::SrvTarget>',`Glib::ListHandler<Gio::SrvTarget, SrvTargetTraits>::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
 -#m4 _CONVERSION(`GList*',`ListHandle_SrvTarget',`$2($3, Glib::OWNERSHIP_DEEP)')
 -  _WRAP_METHOD(ListHandle_SrvTarget lookup_service(const Glib::ustring& service, const Glib::ustring& protocol, const Glib::ustring& domain, const Glib::RefPtr<Cancellable>& cancellable), g_resolver_lookup_service, errthrow)
++#m4 _CONVERSION(`GList*',`std::vector<Gio::SrvTarget>',`Glib::ListHandler<Gio::SrvTarget, SrvTargetTraits>::list_to_vector($3, Glib::OWNERSHIP_DEEP)')
 +  _WRAP_METHOD(std::vector<Gio::SrvTarget> lookup_service(const Glib::ustring& service, const Glib::ustring& protocol, const Glib::ustring& domain, const Glib::RefPtr<Cancellable>& cancellable), g_resolver_lookup_service, errthrow)
+ 
+   //TODO: Documentation
 -  ListHandle_SrvTarget lookup_service(const Glib::ustring& service, const Glib::ustring& protocol, const Glib::ustring& domain);
 -  
 +  std::vector<Gio::SrvTarget> lookup_service(const Glib::ustring& service, const Glib::ustring& protocol, const Glib::ustring& domain);
++
+   //TODO: Documentation
    void lookup_service_async(const Glib::ustring& service, const Glib::ustring& protocol, const Glib::ustring& domain, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable);
+   
+   //TODO: Documentation
    void lookup_service_async(const Glib::ustring& service, const Glib::ustring& protocol, const Glib::ustring& domain, const SlotAsyncReady& slot);
    _IGNORE(g_resolver_lookup_service_async)
+ 
 -  _WRAP_METHOD(ListHandle_SrvTarget lookup_service_finish(const Glib::RefPtr<AsyncResult>& result), g_resolver_lookup_service_finish, errthrow)
 +  _WRAP_METHOD(std::vector<Gio::SrvTarget> lookup_service_finish(const Glib::RefPtr<AsyncResult>& result), g_resolver_lookup_service_finish, errthrow)
  
  
 -  //TODO: Remove no_default_handler when we can break ABI:
 -  _WRAP_SIGNAL(void reload(), reload, no_default_handler)
 +  _WRAP_SIGNAL(void reload(), reload)
  };
  
  std::string hostname_to_ascii (const Glib::ustring& hostname);