[farsight2/master] Have the right marshaller for the stream error signal and use the fs_stream_emit_error function to emit the error instead of doing it directly

[Olivier Crête]

---
 gst-libs/gst/farsight/fs-marshal.list         |    1 +
 gst-libs/gst/farsight/fs-stream-transmitter.c |    2 +-
 gst-libs/gst/farsight/fs-stream.c             |    2 +-
 gst/fsrtpconference/fs-rtp-stream.c           |    4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-marshal.list b/gst-libs/gst/farsight/fs-marshal.list
index 764c8cc..5b8f6ef 100644
--- a/gst-libs/gst/farsight/fs-marshal.list
+++ b/gst-libs/gst/farsight/fs-marshal.list
@@ -1,2 +1,3 @@
 VOID:OBJECT,INT,STRING,STRING
+VOID:INT,STRING,STRING
 VOID:BOXED,BOXED
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.c b/gst-libs/gst/farsight/fs-stream-transmitter.c
index a3bf00d..7611f2c 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.c
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.c
@@ -152,7 +152,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
       0,
       NULL,
       NULL,
-      fs_marshal_VOID__OBJECT_INT_STRING_STRING,
+      fs_marshal_VOID__INT_STRING_STRING,
       G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
 
     /**
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index 94b05a5..448c9fa 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -237,7 +237,7 @@ fs_stream_class_init (FsStreamClass *klass)
       0,
       NULL,
       NULL,
-      fs_marshal_VOID__OBJECT_INT_STRING_STRING,
+      fs_marshal_VOID__INT_STRING_STRING,
       G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
 
   /**
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index 9d28bba..8fa642f 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -560,9 +560,9 @@ _transmitter_error (
     gchar *debug_msg,
     gpointer user_data)
 {
-  FsRtpStream *self = FS_RTP_STREAM (user_data);
+  FsStream *stream = FS_STREAM (user_data);
 
-  g_signal_emit_by_name (self, "error", errorno, error_msg, debug_msg);
+  fs_stream_emit_error (stream, errorno, error_msg, debug_msg);
 }
 
 void
-- 
1.5.6.5