[farsight2/master] Use FS_ERROR_NO_CODECS_LEFT where appropriate

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:24:15 PST 2008


---
 gst/fsrtpconference/fs-rtp-session.c |    2 +-
 tests/check/rtp/codecs.c             |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 7936660..b40de66 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -1956,7 +1956,7 @@ fs_rtp_session_negotiate_codecs (FsRtpSession *session,
 
   if (!new_negotiated_codec_associations)
   {
-    g_set_error (error, FS_ERROR, FS_ERROR_NO_CODECS,
+    g_set_error (error, FS_ERROR, FS_ERROR_NO_CODECS_LEFT,
         "Codec config would leave no valid local codecs");
     goto error;
   }
diff --git a/tests/check/rtp/codecs.c b/tests/check/rtp/codecs.c
index 7c89ad1..cfe7fdc 100644
--- a/tests/check/rtp/codecs.c
+++ b/tests/check/rtp/codecs.c
@@ -162,8 +162,10 @@ GST_START_TEST (test_rtpcodecs_codec_preferences)
           &error),
       "Disabling all codecs did not fail");
   fail_unless (error != NULL, "The error is not set");
-  fail_unless (error->code == FS_ERROR_NO_CODECS,
-      "The error code is %d, not FS_ERROR_NO_CODECS");
+  fail_unless (error->domain == FS_ERROR,
+      "Domain is not FS_ERROR");
+  fail_unless (error->code == FS_ERROR_NO_CODECS_LEFT,
+      "The error code is %d, not FS_ERROR_NO_CODECS_LEFT");
 
   g_clear_error (&error);
 
-- 
1.5.6.5




More information about the farsight-commits mailing list