[gstreamermm: 21/167] fixed bus

[Murray Cumming <murrayc src gnome org>]

commit 84053ddd13254e982ed2e89bd01ee6c2eb29dbb2
Author: Marcin Kolny at Flytronic <marcin kolny flytronic pl>
Date:   Wed Jul 24 16:44:23 2013 +0200

    fixed bus

 gstreamer/src/bus.ccg      |    8 ++++----
 gstreamer/src/bus.hg       |    2 +-
 tests/test-message-wrap.cc |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gstreamer/src/bus.ccg b/gstreamer/src/bus.ccg
index f2846cc..f4b47ae 100644
--- a/gstreamer/src/bus.ccg
+++ b/gstreamer/src/bus.ccg
@@ -33,7 +33,7 @@ static gboolean Bus_Message_gstreamermm_callback(GstBus* bus, GstMessage* messag
 
   try
   {
-    return (*the_slot)(Glib::wrap(bus, true), Gst::Message::wrap(message, true));
+    return (*the_slot)(Glib::wrap(bus, true), Glib::wrap(message, true));
   }
   catch(...)
   {
@@ -54,7 +54,7 @@ static GstBusSyncReply Bus_Message_Sync_gstreamermm_callback(GstBus* bus, GstMes
 
   try
   {
-    return static_cast<GstBusSyncReply>((*the_slot)(Glib::wrap(bus, true), Gst::Message::wrap(message, 
true)));
+    return static_cast<GstBusSyncReply>((*the_slot)(Glib::wrap(bus, true), Glib::wrap(message, true)));
   }
   catch(...)
   {
@@ -92,10 +92,10 @@ void Bus::set_sync_handler(const SlotMessageSync& slot)
 
   // Clear a possibly existing sync handler by calling with 0 before setting
   // a new one (see gst_bus_set_sync_handler docs)
-  gst_bus_set_sync_handler(gobj(), 0, 0);
+  gst_bus_set_sync_handler(gobj(), 0, 0, 0);
 
   slot_copy = slot;
-  gst_bus_set_sync_handler(gobj(), &Bus_Message_Sync_gstreamermm_callback, &slot_copy);
+  gst_bus_set_sync_handler(gobj(), &Bus_Message_Sync_gstreamermm_callback, &slot_copy, 
&Bus_Message_gstreamermm_callback_destroy);
 }
 
 } //namespace Gst
diff --git a/gstreamer/src/bus.hg b/gstreamer/src/bus.hg
index 89655f7..750cd87 100644
--- a/gstreamer/src/bus.hg
+++ b/gstreamer/src/bus.hg
@@ -168,7 +168,7 @@ public:
   _WRAP_METHOD(void remove_signal_watch(), gst_bus_remove_signal_watch)
   _WRAP_METHOD(Glib::RefPtr<Gst::Message> poll(MessageType message_type, ClockTime timeout), gst_bus_poll)
 
-#m4 _CONVERSION(`GstMessage*',`const Glib::RefPtr<Gst::Message>&', `Gst::Message::wrap($3, true)')
+#m4 _CONVERSION(`GstMessage*',`const Glib::RefPtr<Gst::Message>&', `Glib::wrap($3, true)')
 
   _WRAP_SIGNAL(void message(const Glib::RefPtr<Gst::Message>& message), "message")
   _WRAP_SIGNAL(void sync_message(const Glib::RefPtr<Gst::Message>& message), "sync-message")
diff --git a/tests/test-message-wrap.cc b/tests/test-message-wrap.cc
index 2244784..f7ed9b1 100644
--- a/tests/test-message-wrap.cc
+++ b/tests/test-message-wrap.cc
@@ -30,7 +30,7 @@ int main(int argc, char** argv)
   GError* cerror = g_error_new_literal(GST_CORE_ERROR, GST_CORE_ERROR_FAILED, "test error message");
   GstMessage* cmessage = gst_message_new_warning(cobject, cerror, "test debug text");
   
-  Glib::RefPtr<Gst::Message> message = Gst::Message::wrap(cmessage);
+  Glib::RefPtr<Gst::Message> message = Glib::wrap(cmessage);
 
   std::cout << "C++ message instance is !null: " << (bool)(message) << std::endl;