giomm: Add some unwrapped methods and properties.

	* gio/src/drive.hg: Add get_sort_key().
	* gio/src/emblemedicon.hg: Add clear_emblems().
	* gio/src/fileicon.hg: Add the "file" property.
	* gio/src/inetaddress.hg: Add address_equal().
	* gio/src/mount.hg: Add get_sort_key().
	* gio/src/socket.hg: Add the "timeout" property.
	* gio/src/socketaddress.hg: Add the "family" property.
	* tools/m4/convert_gio.m4: Add a necessary conversion.

9 files changed, 25 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index eafc3efd..6d1fab57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2011-10-26  José Alburquerque  <jaalburqu@svn.gnome.org>
 
+	giomm: Add some unwrapped methods and properties.
+
+	* gio/src/drive.hg: Add get_sort_key().
+	* gio/src/emblemedicon.hg: Add clear_emblems().
+	* gio/src/fileicon.hg: Add the "file" property.
+	* gio/src/inetaddress.hg: Add address_equal().
+	* gio/src/mount.hg: Add get_sort_key().
+	* gio/src/socket.hg: Add the "timeout" property.
+	* gio/src/socketaddress.hg: Add the "family" property.
+	* tools/m4/convert_gio.m4: Add a necessary conversion.
+
+2011-10-26  José Alburquerque  <jaalburqu@svn.gnome.org>
+
 	gmmproc: Example Removal: Also remove code in </programlisting> tags.
 
 	* tools/pm/DocsParser.pm (lookup_documentation): Also remove code in
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index 020f2ffc..0ee9f67a 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -150,6 +150,8 @@ public:
 
   _WRAP_METHOD(DriveStartStopType get_start_stop_type() const, g_drive_get_start_stop_type)
 
+  _WRAP_METHOD(Glib::ustring get_sort_key() const,  g_drive_get_sort_key)
+
   /** @newin{2,20}
    */
   _WRAP_SIGNAL(void changed(), changed, no_default_handler)
diff --git a/gio/src/emblemedicon.hg b/gio/src/emblemedicon.hg
index 707cce59..bfa3583f 100644
--- a/gio/src/emblemedicon.hg
+++ b/gio/src/emblemedicon.hg
@@ -89,6 +89,7 @@ public:
 //  _WRAP_METHOD(Glib::ListHandle<Glib::RefPtr<const Emblem> > get_emblems() const, g_emblemed_icon_get_emblems, constversion)
 
   _WRAP_METHOD(void add_emblem(const Glib::RefPtr<Emblem>& emblem), g_emblemed_icon_add_emblem)
+  _WRAP_METHOD(void clear_emblems(), g_emblemed_icon_clear_emblems)
 };
 
 } // namespace Gio
diff --git a/gio/src/fileicon.hg b/gio/src/fileicon.hg
index f87dd373..ed73c8b3 100644
--- a/gio/src/fileicon.hg
+++ b/gio/src/fileicon.hg
@@ -49,6 +49,8 @@ public:
 
   _WRAP_METHOD(Glib::RefPtr<File> get_file(), g_file_icon_get_file, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const File> get_file() const, g_file_icon_get_file, refreturn, constversion)
+
+  _WRAP_PROPERTY("file", Glib::RefPtr<File>)
 };
 
 } // namespace Gio
diff --git a/gio/src/inetaddress.hg b/gio/src/inetaddress.hg
index 6850bc60..10a66e7a 100644
--- a/gio/src/inetaddress.hg
+++ b/gio/src/inetaddress.hg
@@ -54,6 +54,8 @@ public:
   static Glib::RefPtr<InetAddress> create_any(SocketFamily family);
   static Glib::RefPtr<InetAddress> create_loopback(SocketFamily family);
 
+  _WRAP_METHOD(bool address_equal(const Glib::RefPtr<const InetAddress>& other_address) const, g_inet_address_equal)
+
   _WRAP_METHOD(const guint8* to_bytes() const, g_inet_address_to_bytes)
   _WRAP_METHOD(Glib::ustring to_string() const, g_inet_address_to_string)
   _WRAP_METHOD(SocketFamily get_family() const, g_inet_address_get_family)
diff --git a/gio/src/mount.hg b/gio/src/mount.hg
index 987b0317..e62f4728 100644
--- a/gio/src/mount.hg
+++ b/gio/src/mount.hg
@@ -212,6 +212,7 @@ public:
 
   _WRAP_METHOD(Glib::RefPtr<File> get_default_location() const, g_mount_get_default_location)
 
+  _WRAP_METHOD(Glib::ustring get_sort_key() const, g_mount_get_sort_key)
 
   _WRAP_SIGNAL(void changed(), changed)
   _WRAP_SIGNAL(void unmounted(), unmounted)
diff --git a/gio/src/socket.hg b/gio/src/socket.hg
index 4d13cd6b..1587c0a9 100644
--- a/gio/src/socket.hg
+++ b/gio/src/socket.hg
@@ -195,6 +195,7 @@ public:
   _WRAP_PROPERTY("listen-backlog", int)
   _WRAP_PROPERTY("local-address", Glib::RefPtr<SocketAddress>)
   _WRAP_PROPERTY("remote-address", Glib::RefPtr<SocketAddress>)
+  _WRAP_PROPERTY("timeout", guint)
   _WRAP_PROPERTY("protocol", SocketProtocol)
   _WRAP_PROPERTY("type", SocketType)
 };
diff --git a/gio/src/socketaddress.hg b/gio/src/socketaddress.hg
index 02f241d3..2739673d 100644
--- a/gio/src/socketaddress.hg
+++ b/gio/src/socketaddress.hg
@@ -48,6 +48,8 @@ public:
   _WRAP_METHOD(SocketFamily get_family() const, g_socket_address_get_family)
   _WRAP_METHOD(bool to_native(gpointer dest, gsize destlen), g_socket_address_to_native, errthrow)
   _WRAP_METHOD(gssize get_native_size() const, g_socket_address_get_native_size)
+
+  _WRAP_PROPERTY("family", Glib::RefPtr<SocketFamily>)
 };
 
 } // namespace Gio
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index a585f934..18862c6b 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -158,6 +158,7 @@ _CONVERSION(`const Glib::RefPtr<const IOStream>&',`GIOStream*',`const_cast<GIOSt
 
 # InetAddress
 _CONVERSION(`const Glib::RefPtr<InetAddress>&',`GInetAddress*',__CONVERT_CONST_REFPTR_TO_P)
+_CONVERSION(`const Glib::RefPtr<const InetAddress>&',`GInetAddress*',`const_cast<GInetAddress*>(Glib::unwrap($3))')
 _CONVERSION(`GInetAddress*',`Glib::RefPtr<InetAddress>',`Glib::wrap($3)')
 
 # InputStream