From a1fbb359ea84cfc92f9582722faf216fd56c8939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 30 Apr 2020 11:22:11 +0300
Subject: [PATCH] rtsp-server: Use log() instead of log_with_object() for now
 in the 0.15 branch

See 8077b7ac8298d28ec386c1d76f31912d6555b2d0
---
 gstreamer-rtsp-server/src/subclass/rtsp_client.rs |  4 ++--
 gstreamer-rtsp-server/src/subclass/rtsp_media.rs  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_client.rs b/gstreamer-rtsp-server/src/subclass/rtsp_client.rs
index 5cae039d1..174f6d968 100644
--- a/gstreamer-rtsp-server/src/subclass/rtsp_client.rs
+++ b/gstreamer-rtsp-server/src/subclass/rtsp_client.rs
@@ -870,7 +870,7 @@ where
     ) {
         Ok(()) => glib_sys::GTRUE,
         Err(err) => {
-            err.log_with_object(&wrap);
+            err.log();
             glib_sys::GFALSE
         }
     }
@@ -1107,7 +1107,7 @@ where
     ) {
         Ok(()) => glib_sys::GTRUE,
         Err(err) => {
-            err.log_with_object(&wrap);
+            err.log();
             glib_sys::GFALSE
         }
     }
diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_media.rs b/gstreamer-rtsp-server/src/subclass/rtsp_media.rs
index 8ed01479e..430bb39d7 100644
--- a/gstreamer-rtsp-server/src/subclass/rtsp_media.rs
+++ b/gstreamer-rtsp-server/src/subclass/rtsp_media.rs
@@ -506,7 +506,7 @@ where
     match imp.prepare(&wrap, &from_glib_borrow(thread)) {
         Ok(()) => glib_sys::GTRUE,
         Err(err) => {
-            err.log_with_object(&wrap);
+            err.log();
             glib_sys::GFALSE
         }
     }
@@ -525,7 +525,7 @@ where
     match imp.unprepare(&wrap) {
         Ok(()) => glib_sys::GTRUE,
         Err(err) => {
-            err.log_with_object(&wrap);
+            err.log();
             glib_sys::GFALSE
         }
     }
@@ -544,7 +544,7 @@ where
     match imp.suspend(&wrap) {
         Ok(()) => glib_sys::GTRUE,
         Err(err) => {
-            err.log_with_object(&wrap);
+            err.log();
             glib_sys::GFALSE
         }
     }
@@ -563,7 +563,7 @@ where
     match imp.unsuspend(&wrap) {
         Ok(()) => glib_sys::GTRUE,
         Err(err) => {
-            err.log_with_object(&wrap);
+            err.log();
             glib_sys::GFALSE
         }
     }
@@ -648,7 +648,7 @@ where
     let res = match imp.setup_rtpbin(&wrap, &from_glib_borrow(rtpbin)) {
         Ok(()) => glib_sys::GTRUE,
         Err(err) => {
-            err.log_with_object(&wrap);
+            err.log();
             glib_sys::GFALSE
         }
     };
@@ -678,7 +678,7 @@ where
     ) {
         Ok(()) => glib_sys::GTRUE,
         Err(err) => {
-            err.log_with_object(&wrap);
+            err.log();
             glib_sys::GFALSE
         }
     }
@@ -773,7 +773,7 @@ where
     match imp.handle_sdp(&wrap, &*(sdp as *const gst_sdp::SDPMessageRef)) {
         Ok(()) => glib_sys::GTRUE,
         Err(err) => {
-            err.log_with_object(&wrap);
+            err.log();
             glib_sys::GFALSE
         }
     }