Add TypeTraits implementations for Drive and Volume similar to the one added for Mount.

svn path=/trunk/; revision=660

3 files changed, 87 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d0b97ab..10b9fdf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-25  Jonathon Jongsma  <jjongsma@gnome.org>
+
+	* gio/src/drive.hg:
+	* gio/src/volume.hg: add TypeTraits implementations for Drive and Volume
+	similar to the one added for Mount.
+
 2008-04-23  Jonathon Jongsma  <jjongsma@gnome.org>
 
 	* gio/src/mount.hg: Add a TypeTraits implementation for
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index 813e415f..7d875dac 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -119,3 +119,43 @@ public:
 
 } // namespace Gio
 
+namespace Glib
+{
+
+//Pre-declare this so we can use it in TypeTrait:
+Glib::RefPtr<Gio::Drive> wrap(GDrive* object, bool take_copy);
+
+namespace Container_Helpers
+{
+
+/** This specialization of TypeTraits exists 
+ * because the default use of Glib::wrap(GObject*), 
+ * instead of a specific Glib::wrap(GSomeInterface*),
+ * would not return a wrapper for an interface.
+ */ 
+template <>
+struct TypeTraits< Glib::RefPtr<Gio::Drive> >
+{
+  typedef Glib::RefPtr<Gio::Drive> CppType;
+  typedef GDrive* CType;
+  typedef GDrive* CTypeNonConst;
+
+  static CType   to_c_type      (const CppType& item)
+  { return Glib::unwrap (item); }
+
+  static CppType to_cpp_type    (const CType& item)
+  {
+    //Use a specific Glib::wrap() function, 
+    //because CType has the specific type (not just GObject):
+    return Glib::wrap(item, true /* take_copy */);
+  }
+
+  static void    release_c_type (CType item)
+  {
+    GLIBMM_DEBUG_UNREFERENCE(0, item);
+    g_object_unref(item);
+  }
+};
+
+} // Container_Helpers
+} // Glib
diff --git a/gio/src/volume.hg b/gio/src/volume.hg
index 4d43180a..26dee39c 100644
--- a/gio/src/volume.hg
+++ b/gio/src/volume.hg
@@ -181,3 +181,44 @@ public:
 };
 
 } // namespace Gio
+
+namespace Glib
+{
+
+//Pre-declare this so we can use it in TypeTrait:
+Glib::RefPtr<Gio::Volume> wrap(GVolume* object, bool take_copy);
+
+namespace Container_Helpers
+{
+
+/** This specialization of TypeTraits exists 
+ * because the default use of Glib::wrap(GObject*), 
+ * instead of a specific Glib::wrap(GSomeInterface*),
+ * would not return a wrapper for an interface.
+ */ 
+template <>
+struct TypeTraits< Glib::RefPtr<Gio::Volume> >
+{
+  typedef Glib::RefPtr<Gio::Volume> CppType;
+  typedef GVolume* CType;
+  typedef GVolume* CTypeNonConst;
+
+  static CType   to_c_type      (const CppType& item)
+  { return Glib::unwrap (item); }
+
+  static CppType to_cpp_type    (const CType& item)
+  {
+    //Use a specific Glib::wrap() function, 
+    //because CType has the specific type (not just GObject):
+    return Glib::wrap(item, true /* take_copy */);
+  }
+
+  static void    release_c_type (CType item)
+  {
+    GLIBMM_DEBUG_UNREFERENCE(0, item);
+    g_object_unref(item);
+  }
+};
+
+} // Container_Helpers
+} // Glib