[gstreamermm] Discoverer: Complete a TODO.

[Josà Alburquerque <jaalburqu src gnome org>]

commit 757acc7c0f35360e3e0241f24716acdf3278ae53
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date:   Fri Jul 15 01:42:41 2011 -0400

    Discoverer: Complete a TODO.
    
    	* gstreamer/src/discoverer.hg (discovered): Use a Glib::Error instead
    	of a GError when wrapping this signal.
    	* tools/m4/convert_gst.m4: Add a GError conversion.

 ChangeLog                   |    8 ++++++++
 gstreamer/src/discoverer.hg |    5 ++---
 tools/m4/convert_gst.m4     |    1 +
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 736cc99..abb0c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-07-15  Josà Alburquerque  <jaalburqu svn gnome org>
 
+	Discoverer: Complete a TODO.
+
+	* gstreamer/src/discoverer.hg (discovered): Use a Glib::Error instead
+	of a GError when wrapping this signal.
+	* tools/m4/convert_gst.m4: Add a GError conversion.
+
+2011-07-15  Josà Alburquerque  <jaalburqu svn gnome org>
+
 	Discoverer: Wrap the methods, properties and signals.
 
 	* tools/extra_defs_gen/generate_defs_gst.cc: Alphabetize the
diff --git a/gstreamer/src/discoverer.hg b/gstreamer/src/discoverer.hg
index 0981a2f..6584875 100644
--- a/gstreamer/src/discoverer.hg
+++ b/gstreamer/src/discoverer.hg
@@ -19,7 +19,6 @@
 
 #include <glibmm/object.h>
 #include <gstreamermm/clock.h>
-#include <gstreamermm/miniobject.h>
 #include <gst/pbutils/pbutils.h>
 
 _DEFS(gstreamermm,gst)
@@ -64,9 +63,9 @@ public:
   _WRAP_PROPERTY("timeout", guint64)
 
 #m4 _CONVERSION(`GstDiscovererInfo*', `const Glib::RefPtr<DiscovererInfo>&', `Gst::wrap($3,true)')
+#m4 _CONVERSION(`const GError*', `const Glib::Error&', `Glib::Error(const_cast<GError*>($3), true)')
   //TODO: Docs?
-  //TODO: Use a Glib::Error instead of a GError?
-  _WRAP_SIGNAL(void discovered(const Glib::RefPtr<DiscovererInfo>& info, const GError* error), "discovered")
+  _WRAP_SIGNAL(void discovered(const Glib::RefPtr<DiscovererInfo>& info, const Glib::Error& error), "discovered")
 
   _WRAP_SIGNAL(void finished(), "finished")
   _WRAP_SIGNAL(void starting(), "starting")
diff --git a/tools/m4/convert_gst.m4 b/tools/m4/convert_gst.m4
index e1dbb9c..b5af941 100644
--- a/tools/m4/convert_gst.m4
+++ b/tools/m4/convert_gst.m4
@@ -243,6 +243,7 @@ dnl C++ Conversions
 _CONVERSION(`const va_list&',`va_list',`const_cast<va_list&>($3)')
 
 dnl Glibmm Conversions
+_CONVERSION(`const Glib::Error&', `const GError*', `$3.gobj()')
 _CONVERSION(`GQuark',`Glib::QueryQuark',`Glib::QueryQuark($3)')
 _CONVERSION(`const Glib::QueryQuark&',`GQuark',`$3')
 _CONVERSION(`Glib::StaticRecMutex&',`GStaticRecMutex*',`$3.gobj()')